From 281e325bea944f93b7583e7e62dd00782bff2f78 Mon Sep 17 00:00:00 2001
From: yangrz <yangrz@vip.qq.com>
Date: Tue, 23 Jan 2024 20:50:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8B=89=E5=8A=A0=E8=BD=BD=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agentApp/pages/history/history.vue            | 89 +++++++++++--------
 agentApp/pages/merchant-index/index.vue       | 30 +++++--
 agentApp/pages/user-orders/user-orders.vue    | 27 +++++-
 .../withdrawal-history/withdrawal-history.vue | 30 +++++--
 4 files changed, 123 insertions(+), 53 deletions(-)

diff --git a/agentApp/pages/history/history.vue b/agentApp/pages/history/history.vue
index 9ccd7b0..fcdb248 100644
--- a/agentApp/pages/history/history.vue
+++ b/agentApp/pages/history/history.vue
@@ -36,13 +36,14 @@
 						审核时间：{{item.reviewed_at}}
 					</view>
 				</view>
-<!-- 				<view class="hit-right">
+				<!-- 				<view class="hit-right">
 					<view class="amount">提现金额：￥{{item.amount}}</view>
 					<view class="fee">手续费：￥{{item.fee}}</view>
 					<view class="receive-amount">实到账：￥{{item.receive_amount}}</view>
 				</view> -->
 			</view>
 		</view>
+		<view class="load-more" @click="getWithdrawList">{{ hasMore ? '加载更多数据...' : '已加载完毕' }}</view>
 	</view>
 </template>
 
@@ -55,65 +56,83 @@
 		data() {
 			return {
 				withdrawList: [],
+				hasMore: true,
+				page: 0,
 			};
 		},
 		onLoad() {
 			this.getWithdrawList()
 		},
+		onReachBottom() {
+			this.getWithdrawList()
+		},
 		methods: {
 			getWithdrawList() {
+				if (!this.hasMore) {
+					return
+				}
+				this.page++
 				agentWithdrawList({
-					page: 1,
+					page: this.page,
 					page_size: 15,
-				}).then(data => this.withdrawList = data.list)
+				}).then(data => {
+					this.withdrawList = [...this.withdrawList, ...data.list]
+					this.hasMore = data.has_more
+				})
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-.his-content {
-	padding: 0 30rpx;
+	.his-content {
+		padding: 0 30rpx;
 
-	.his-item {
-		display: flex;
-		justify-content: space-between;
-		padding: 30rpx 0 30rpx;
+		.his-item {
+			display: flex;
+			justify-content: space-between;
+			padding: 30rpx 0 30rpx;
 
-		.hit-left {
+			.hit-left {
 
-			.his-name {
-				color: #454545;
-				font-size: 12px;
-				line-height: 1.8;
-				font-weight: bold;
-			}
+				.his-name {
+					color: #454545;
+					font-size: 12px;
+					line-height: 1.8;
+					font-weight: bold;
+				}
 
-			.his-state {
-				color: #666;
-				font-size: 12px;
-				line-height: 1.8;
+				.his-state {
+					color: #666;
+					font-size: 12px;
+					line-height: 1.8;
+				}
+
+				.his-time {
+					color: #999;
+					font-size: 12px;
+					line-height: 1.8;
+				}
 			}
 
-			.his-time {
-				color: #999;
-				font-size: 12px;
-				line-height: 1.8;
+			.hit-right {
+				height: 130rpx;
+				line-height: 130rpx;
+				font-size: 14px;
+				color: #454545;
+				font-weight: bold;
 			}
 		}
 
-		.hit-right {
-			height: 130rpx;
-			line-height: 130rpx;
-			font-size: 14px;
-			color: #454545;
-			font-weight: bold;
+		.u-border-bottom,
+		.u-border-top {
+			border-color: #eee !important;
 		}
+
 	}
 
-	.u-border-bottom,
-	.u-border-top {
-		border-color: #eee !important;
+	.load-more {
+		text-align: center;
+		font-size: 14px;
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/agentApp/pages/merchant-index/index.vue b/agentApp/pages/merchant-index/index.vue
index 9780c3a..e13cac2 100644
--- a/agentApp/pages/merchant-index/index.vue
+++ b/agentApp/pages/merchant-index/index.vue
@@ -73,12 +73,9 @@
 					<view class="divider-style"></view>
 				</view>
 			</view>
-		</view>
-
-	</view>
-
-	</view>
 
+		<view class="load-more" @click="getOrderList">{{ hasMore ? '加载更多数据...' : '已加载完毕' }}</view>
+		</view>
 	</view>
 </template>
 <script>
@@ -92,22 +89,34 @@
 		data() {
 			return {
 				accountInfo: {},
-				orderList: []
+				orderList: [],
+				hasMore: true,
+				page: 0,
 			}
 		},
 		onLoad() {
 			this.getAccountInfo()
 			this.getOrderList()
 		},
+		onReachBottom() {
+			this.getOrderList()
+		},
 		methods: {
 			getAccountInfo() {
 				merchantAccountInfo().then(data => this.accountInfo = data)
 			},
 			getOrderList() {
+				if (!this.hasMore) {
+					return
+				}
+				this.page++
 				merchantOrderList({
-					page: 1,
+					page: this.page,
 					page_size: 15
-				}).then(data => this.orderList = data.list)
+				}).then(data => {
+					this.orderList = [...this.orderList, ...data.list]
+					this.hasMore = data.has_more
+				})
 			},
 			orderRefund(item) {
 				uni.showModal({
@@ -392,4 +401,9 @@
 
 		}
 	}
+	
+	.load-more {
+		text-align: center;
+		font-size: 14px;
+	}
 </style>
\ No newline at end of file
diff --git a/agentApp/pages/user-orders/user-orders.vue b/agentApp/pages/user-orders/user-orders.vue
index 0d25823..62cd1ca 100644
--- a/agentApp/pages/user-orders/user-orders.vue
+++ b/agentApp/pages/user-orders/user-orders.vue
@@ -73,6 +73,8 @@
 					</view>
 				</view>
 			</view>
+			
+			<view class="load-more" @click="getOrderList">{{ hasMore ? '加载更多数据...' : '已加载完毕' }}</view>
 		</view>
 	</view>
 
@@ -90,7 +92,9 @@
 			return {
 				accountInfo: {},
 				queueList: [],
-				orderList: []
+				orderList: [],
+				hasMore: true,
+				page: 0,
 			}
 		},
 		onLoad() {
@@ -98,6 +102,9 @@
 			this.getQueueList();
 			this.getOrderList();
 		},
+		onReachBottom() {
+			this.getOrderList()
+		},
 		methods: {
 			getAccountInfo() {
 				userAccountInfo().then(data => this.accountInfo = data)
@@ -111,10 +118,17 @@
 				}).then(data => this.queueList = data.list)
 			},
 			getOrderList() {
+				if (!this.hasMore) {
+					return
+				}
+				this.page++
 				userOrderList({
-					page: 1,
-					page_size: 5
-				}).then(data => this.orderList = data.list)
+					page: this.page,
+					page_size: 15
+				}).then(data => {
+					this.orderList = [...this.orderList, ...data.list]
+					this.hasMore = data.has_more
+				})
 			},
 		}
 	}
@@ -391,4 +405,9 @@
 		border-bottom: 1rpx solid #eee;
 		padding-bottom: 30rpx;
 	}
+	
+	.load-more {
+		text-align: center;
+		font-size: 14px;
+	}
 </style>
\ No newline at end of file
diff --git a/agentApp/pages/withdrawal-history/withdrawal-history.vue b/agentApp/pages/withdrawal-history/withdrawal-history.vue
index 783dc37..034df46 100644
--- a/agentApp/pages/withdrawal-history/withdrawal-history.vue
+++ b/agentApp/pages/withdrawal-history/withdrawal-history.vue
@@ -36,13 +36,14 @@
 						审核时间：{{item.reviewed_at}}
 					</view>
 				</view>
-<!-- 				<view class="hit-right">
+				<!-- 				<view class="hit-right">
 					<view class="amount">提现金额：￥{{item.amount}}</view>
 					<view class="fee">手续费：￥{{item.fee}}</view>
 					<view class="receive-amount">实到账：￥{{item.receive_amount}}</view>
 				</view> -->
 			</view>
 		</view>
+		<view class="load-more" @click="getWithdrawList">{{ hasMore ? '加载更多数据...' : '已加载完毕' }}</view>
 	</view>
 </template>
 
@@ -55,17 +56,29 @@
 		data() {
 			return {
 				withdrawList: [],
+				hasMore: true,
+				page: 0,
 			};
 		},
 		onLoad() {
 			this.getWithdrawList()
 		},
+		onReachBottom() {
+			this.getWithdrawList()
+		},
 		methods: {
 			getWithdrawList() {
+				if (!this.hasMore) {
+					return
+				}
+				this.page++
 				userWithdrawList({
-					page: 1,
+					page: this.page,
 					page_size: 15,
-				}).then(data => this.withdrawList = data.list)
+				}).then(data => {
+					this.withdrawList = [...this.withdrawList, ...data.list]
+					this.hasMore = data.has_more
+				})
 			}
 		}
 	}
@@ -106,15 +119,15 @@
 				font-size: 14px;
 				color: #454545;
 				font-weight: bold;
-				
+
 				.amount {
 					font-size: 14px;
 				}
-				
+
 				.fee {
 					font-size: 14px;
 				}
-				
+
 				.receive_amount {
 					font-size: 14px;
 				}
@@ -126,4 +139,9 @@
 			border-color: #eee !important;
 		}
 	}
+	
+	.load-more {
+		text-align: center;
+		font-size: 14px;
+	}
 </style>
\ No newline at end of file