From a8e3602891f6de8d0fdfb6a53dddfd87d9f9aeba Mon Sep 17 00:00:00 2001
From: chenbiao <chenbiao0828@foxmail.com>
Date: Tue, 17 May 2022 15:45:10 +0800
Subject: [PATCH] add 我的钱包 小程序支付 接口联调

---
 pages/moneyRecharge/moneyRecharge.vue   |  3 ++-
 pages/rechargeDetail/rechargeDetail.vue | 47 +++++++++++++++++++++++------------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pages/moneyRecharge/moneyRecharge.vue b/pages/moneyRecharge/moneyRecharge.vue
index 9ebb0db..f1fa8d9 100644
--- a/pages/moneyRecharge/moneyRecharge.vue
+++ b/pages/moneyRecharge/moneyRecharge.vue
@@ -145,6 +145,7 @@
 					rechargeType: '2',
 					acctType: '1',
 					paySrcType: '204',
+					payType:'4',
 					realPayMoney: payMoney,
 					rechargeFee: payMoney,
 				};
@@ -156,7 +157,7 @@
 				}).then(res => {
 					
 					console.log(res)
-					that.MakeWxPay(that.$common.requestSign(data))
+					that.MakeWxPay(res)
 
 				})
 			},
diff --git a/pages/rechargeDetail/rechargeDetail.vue b/pages/rechargeDetail/rechargeDetail.vue
index 75fc4a6..aa29eb4 100644
--- a/pages/rechargeDetail/rechargeDetail.vue
+++ b/pages/rechargeDetail/rechargeDetail.vue
@@ -68,7 +68,7 @@
 					<text>{{item.opTime}}</text>
 				</view>
 			</uni-list>
-			<view class="grace-loading text-center jy-fix-height34" v-if="isLoadAll">{{ loadingTxt }}</view>
+			<uni-load-more :status="status" />
 
 		</view>
 
@@ -104,11 +104,11 @@
 				beginDate: currentDate,
 				overDate: currentDate,
 				orderList: [],
-				isLoadAll: false,
+				// isLoadAll: false,
 				totalPages: 1, // 总页数
 				page: 1,
 				pageSize: 10,
-				loadingTxt: '加载中...',
+				status: 'no-more',
 
 			}
 		},
@@ -124,25 +124,17 @@
 		},
 		// 下拉刷新触发
 		onPullDownRefresh(val) {
+
 			this.page = 1
 			this.pageSize = this.pageSize
 			this.totalPages = 1
+			this.orderList = []
 			console.log('下拉刷新', val)
 			this.fetchData()
 		},
 		// 上拉加载触发
 		onReachBottom() {
-		  console.log('11')
-			//
-			if (this.totalPages === this.orderList.length) {
-				this.isLoadAll = true;
-				this.loadingTxt = '没有更多数据啦~';
-			} else {
-				this.page++;
-				this.isLoadAll = true;
-				this.loadingTxt = '加载中...';
-				this.fetchData(); // 每次滑动请求接口，实现上拉加载更多数据
-			}
+			this.fetchData();
 
 		},
 
@@ -245,7 +237,18 @@
 			},
 
 			fetchData() {
+				console.log(this.totalPages)
+				console.log(this.orderList.length)
+				if (this.totalPages == this.orderList.length) {
+					this.status = 'no-more'
+					console.log('111')
+					return
+				} else {
+					this.page++;
+				}
 				let that = this
+				that.status = 'loading'
+
 				let paramsData = {
 					pageNum: that.page,
 					pageSize: that.pageSize,
@@ -260,19 +263,15 @@
 					method: 'POST',
 					data: that.$common.requestSign(paramsData)
 				}).then(res => {
-
-					const resDataArray = that.orderList.concat(res.data.dataList);
-					if (that.orderList.length === res.data.pageTotals) {
-						that.isLoadAll = true;
-						that.loadingTxt = '没有更多数据啦~';
-						that.orderList = resDataArray;
+					if (res.data.pageTotals < 10) {
+						this.status = 'no-more'
 					} else {
-						that.totalPages = res.data.pageTotals;
-						that.isLoadAll = true;
-						that.loadingTxt = '上拉加载更多数据';
-						that.orderList = resDataArray
+						this.status = 'more'
 					}
 
+					that.totalPages = res.data.pageTotals;
+					that.orderList = that.orderList.concat(res.data.dataList)
+
 
 				})
 
--
libgit2 0.21.4