From 078b097fc44169b9a9ef65e4581f8aa4413fa701 Mon Sep 17 00:00:00 2001
From: yangsanTT <812952667@qq.com>
Date: Tue, 11 May 2021 22:50:21 +0800
Subject: [PATCH] =?UTF-8?q?1=E5=AF=B9=E6=8E=A5=E6=B5=81=E6=B0=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Utils/Api.js                               |  20 +++-
 pages/login/login.vue                      |   2 +-
 pages/user/minePromotion/minePromotion.vue |   8 +-
 pages/user/runningWater/runningWater.vue   | 125 +++++++++++++++++++--
 4 files changed, 143 insertions(+), 12 deletions(-)

diff --git a/Utils/Api.js b/Utils/Api.js
index c3b27ab..de7dfb9 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -127,6 +127,15 @@ export const getDiscountByUserDiscountId = params => {
 export const getUserNormalDiscountList = params => {
 	return POST('GET', `${base}/userDiscount/getUserNormalDiscountList`, params).then(res => res.data);
 }
+//修改密码
+export const sendUserPass = params => {
+	return POST('GET', `${base}/secUser/sendUserPass`, params).then(res => res.data);
+}
+
+
+
+
+
 
 //**门店//
 export const userLogin = params => {
@@ -137,6 +146,8 @@ export const useCouponCode = params => {
 	return POSTBREST('POST', `${brestBase}/couponCode/useCouponCode`, params).then(res => res.data);
 }
 
+
+
 //**代理商//
 export const getAgentCount = params => {
 	return POSTBREST('GET', `${brestBase}/highCouponAgent/getAgentCount`, params).then(res => res.data);
@@ -153,4 +164,11 @@ export const generateCode = params => {
 export const getCodeById = params => {
 	return POSTBREST('GET', `${brestBase}/highCouponAgent/getCodeById`, params).then(res => res.data);
 }
-
+// 查看流水
+export const getAgentSalesCodeList = params => {
+	return POSTBREST('GET', `${brestBase}/highCouponAgent/getAgentSalesCodeList`, params).then(res => res.data);
+}
+//查询流水总价格
+export const getAgentSalesPriceCount = params => {
+	return POSTBREST('GET', `${brestBase}/highCouponAgent/getAgentSalesPriceCount`, params).then(res => res.data);
+}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 590dafd..9b0d5db 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -19,7 +19,7 @@
 			<view class="btn mart50" @tap="doLogin">登 录</view>
 			<view class="res flright mart20">
 			<!-- <view @tap="toPage('register')">用户注册</view> -->
-			<view @tap="toPage('resetpasswd')">重置密码</view>
+			<!-- <view @tap="toPage('resetpasswd')">重置密码</view> -->
 			</view>
 			<!-- <view class="mart30 flright marRight20 font15  fcorfff">重置密码</view> -->
 		</view>
diff --git a/pages/user/minePromotion/minePromotion.vue b/pages/user/minePromotion/minePromotion.vue
index 047588e..bafcbc1 100644
--- a/pages/user/minePromotion/minePromotion.vue
+++ b/pages/user/minePromotion/minePromotion.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="promotion_bg backcorf06 width100 height90 fcorfff fotct font24 fontspec10">我的推广</view>
-		<view class="promotion_dt width90 height100p backcorfff">
+		<view class="promotion_dt width90 height100p backcorfff" @click="jumpRunWater">
 			<view class="width100 mart10 fcor333 font14 fontwig6 height22">
 				<view class="promotion_xg flleft"></view>
 				<view class="promotion_mixg flleft" style="margin-left: -6px;"></view>
@@ -122,6 +122,12 @@
 					}
 				})
 			},
+			//跳转流水
+			jumpRunWater(){
+				uni.navigateTo({
+					url:'../runningWater/runningWater'
+				})
+			},
 			//跳转代理商卡券
 			jumpAgent(item,items) {
 				uni.navigateTo({
diff --git a/pages/user/runningWater/runningWater.vue b/pages/user/runningWater/runningWater.vue
index c579b36..8b0684b 100644
--- a/pages/user/runningWater/runningWater.vue
+++ b/pages/user/runningWater/runningWater.vue
@@ -6,29 +6,47 @@
 				<view class="uni-input datetim">{{date}}<i class="down"></i></view>
 			</picker>
 			<view class="rigMart flright">
-				<view class="width100 font14 fcor999 fontspec">
-					订单数量: 7
+				<view class="width100 font14 fcor999 fontspec" v-if="agentNum">
+					订单数量: {{agentNum}}
 				</view>
-				<view class="width100 font14 fcor999 fontspec">
-					支出: -8233.00
+				<view class="width100 font14 fcor999 fontspec" v-else>
+					订单数量: 0
+				</view>
+				<view class="width100 font14 fcor999 fontspec" v-if="agentToatalPrice">
+					支出: {{agentToatalPrice}}元
+				</view>
+				<view class="width100 font14 fcor999 fontspec" v-else>
+					支出:0 元
 				</view>
 			</view>
 		</view>
 
-		<view class="width100 height90 backcorfff" style="margin-top: 1px;">
+		<view v-if="agentSalesCodeList == '' " class="mart60 fotct font14 fcor666">
+			<image style="width: 100px;height: 100px;"
+				src="data:image/png;base64,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">
+			</image>
+			<view class="mart10">暂无数据</view>
+		</view>
+
+		<view class="width100 height90 backcorfff" style="margin-top: 1px;" v-for="agenL in agentSalesCodeList"
+			:key="agenL.id">
 			<view class="width70 flleft">
-				<view class="font16 fcor333 fontwig6 width100 paddleft10 mart10">2021-01-03 22:38</view>
-				<view class="font13 fcor999 width100 paddleft10 mart10">支出-加油-重庆解放碑站点</view>
-				<view class="font12 fcor999 width100 paddleft10 mart5">订单编号 : 434243232234</view>
+				<view class="font16 fcor333 fontwig6 width100 paddleft10 mart10">
+					{{agenL.highCouponCode.consumeTime | formatDate('-')}}</view>
+				<view class="font13 fcor999 width100 paddleft10 mart10">{{agenL.highCouponCode.storeName}}</view>
 			</view>
 			<view class="width30 flright">
-				<view class="fotct pricew fcoreb5 fontwig6 font14">1500.00元</view>
+				<view class="fotct pricew fcoreb5 fontwig6 font14">{{agenL.highCoupon.salesPrice}}.00元</view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		getAgentSalesCodeList,
+		getAgentSalesPriceCount
+	} from "../../../Utils/Api.js";
 	export default {
 		data() {
 			const currentDate = this.getDate({
@@ -36,8 +54,35 @@
 			})
 			return {
 				date: currentDate,
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false,
+				agentSalesCodeList: [],
+				agentNum: '',
+				agentToatalPrice: ''
 			}
 		},
+		filters: {
+			//过滤器 用于格式化时间
+			formatDate: function(value, spe = '/') {
+				let data = new Date(value);
+				let year = data.getFullYear();
+				let month = data.getMonth() + 1;
+				let day = data.getDate();
+				let h = data.getHours();
+				let mm = data.getMinutes();
+				let s = data.getSeconds();
+				month = month > 10 ? month : "0" + month;
+				day = day > 10 ? day : "0" + day;
+				h = h > 10 ? h : "0" + h;
+				mm = mm > 10 ? mm : "0" + mm;
+				s = s > 10 ? s : "0" + s;
+				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
+			}
+		},
+		onReachBottom() {
+			this.getAgentSalesCodeList();
+		},
 		computed: {
 			startDate() {
 				return this.getDate('start');
@@ -46,9 +91,71 @@
 				return this.getDate('end');
 			}
 		},
+		onLoad() {
+			this.getAgentSalesCodeList();
+			this.getAgentSalesPriceCount();
+		},
 		methods: {
+			//赠券卡券列表
+			getAgentSalesCodeList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let Time = new Date(this.date).getTime();
+				let params = {
+					pageNum: pagenum,
+					consumeTimeS: Time,
+					consumeTimeE: Time,
+					pageSize: this.pageSize
+				}
+
+				getAgentSalesCodeList(params).then(res => {
+					if (res.return_code == '000000' && res.return_data.list != '') {
+						uni.hideLoading();
+						this.agentNum = res.return_data.total;
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						this.agentSalesCodeList = this.agentSalesCodeList.concat(res.return_data.list);
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.agentSalesCodeList = [];
+						this.agentNum = '';
+						uni.hideLoading()
+					}
+				})
+			},
+			getAgentSalesPriceCount() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let Time = new Date(this.date).getTime();
+				let params = {
+					consumeTimeS: Time,
+					consumeTimeE: Time
+				}
+				getAgentSalesPriceCount(params).then(res => {
+					uni.hideLoading()
+					if (res.return_code == '000000' && res.return_data.list != '') {
+						uni.hideLoading();
+						this.agentToatalPrice = res.return_data;
+					}else{
+						this.agentToatalPrice = '';
+					}
+				})
+			},
 			bindDateChange: function(e) {
 				this.date = e.target.value;
+				this.isNoMoreData = false;
+				this.agentSalesCodeList = [];
+				this.getAgentSalesCodeList();
+				this.getAgentSalesPriceCount();
 			},
 			getDate(type) {
 				const date = new Date();