From 36de4a6ad268a5f0116048f017a7d5b5549901ee Mon Sep 17 00:00:00 2001
From: yangrz <yangrz@vip.qq.com>
Date: Wed, 6 Mar 2024 14:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=90=86=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agentApp/common/api.js         |   2 +
 agentApp/pages/index/index.vue | 206 +++++++++++++++++++--------------
 2 files changed, 119 insertions(+), 89 deletions(-)

diff --git a/agentApp/common/api.js b/agentApp/common/api.js
index 648876b..412f327 100644
--- a/agentApp/common/api.js
+++ b/agentApp/common/api.js
@@ -63,6 +63,8 @@ const agentConfig = function() {
 
 export const agentSmsLogin = (params) => http.post(baseUrl + '/api/agent/smsLogin', params)
 export const agentAccountInfo = (params) => http.post(baseUrl + '/api/agent/accountInfo', params, agentConfig())
+export const agentMerchantList = (params) => http.post(baseUrl + '/api/agent/merchantList', params, agentConfig())
+export const agentOrderList = (params) => http.post(baseUrl + '/api/agent/orderList', params, agentConfig())
 export const agentFillAlipayAccount = (params) => http.post(baseUrl + '/api/agent/fillAlipayAccount', params, agentConfig())
 export const agentWithdraw = (params) => http.post(baseUrl + '/api/agent/withdraw', params, agentConfig())
 export const agentWithdrawList = (params) => http.post(baseUrl + '/api/agent/withdrawList', params, agentConfig())
diff --git a/agentApp/pages/index/index.vue b/agentApp/pages/index/index.vue
index 1499289..3e29bd7 100644
--- a/agentApp/pages/index/index.vue
+++ b/agentApp/pages/index/index.vue
@@ -32,107 +32,41 @@
 						<view class="id-value">
 							{{accountInfo.id}}
 						</view>
+						<view class="id-text" style="margin-left:2em;">
+							商户数量：
+						</view>
+						<view class="id-value">
+							{{accountInfo.merchant_count}}
+						</view>
 					</view>
 				</view>
 
 			</view>
 			<view class="agent-main">
 				<view class="agm-title">
-					提现信息
+					订单列表
 				</view>
-				<view class="agm-sitem">
-					<view class="ags-cell u-border-bottom">
-						<view class="agc-title">
-							用户提现流水号
-						</view>
-						<view class="agc-detail">
-							22398983498
-						</view>
+				<view class="ordering-information">
+					<view class="ordering-information-item" v-if="!orderList.length">
+						<view class="order-number">暂无订单</view>
 					</view>
-					<view class="ags-cell u-border-bottom">
-						<view class="agc-title">
-							提现金额
-						</view>
-						<view class="agc-detail">
-							<view class="price">
-								￥458.00
+					<view class="ordering-information-item" v-for="order in orderList" :key="order.out_trade_no">
+						<view class="order-number">订单编号 {{order.out_trade_no}}</view>
+						<view class="ordering-item-content">
+							<view class="ordering-pic">
+								<image class="order-chart" :src="order.merchant.logo" />
 							</view>
-						</view>
-					</view>
-					<view class="ags-cell u-border-bottom">
-						<view class="agc-title">
-							分成比例
-						</view>
-						<view class="agc-detail">
-							5%
-						</view>
-					</view>
-					<view class="ags-cell u-border-bottom">
-						<view class="agc-title">
-							状态
-						</view>
-						<view class="agc-detail">
-							到账
-						</view>
-					</view>
-					<view class="ags-cell">
-						<view class="agc-title">
-							时间
-						</view>
-						<view class="agc-detail">
-							2023-11-24 15:45:56
-						</view>
-					</view>
-					<u-gap height="10rpx" bgColor="#F7F7F7"></u-gap>
-				</view>
-				<view class="agm-sitem">
-					<view class="ags-cell u-border-bottom">
-						<view class="agc-title">
-							用户提现流水号
-						</view>
-						<view class="agc-detail">
-							22398983498
-						</view>
-					</view>
-					<view class="ags-cell u-border-bottom">
-						<view class="agc-title">
-							提现金额
-						</view>
-						<view class="agc-detail">
-							<view class="price">
-								￥458.00
+							<view class="ordering-text">
+								<view class="ordering-text-title">{{order.merchant.name}}</view>
+								<view class="amount-of-money">金额：<span class="price-style">￥{{order.amount}}</span></view>
+								<view class="amount-of-money">收益：<span class="price-style">￥{{order.agent_income}}</span></view>
+								<view class="order-time">订单时间：{{order.paid_at}}</view>
 							</view>
 						</view>
 					</view>
-					<view class="ags-cell u-border-bottom">
-						<view class="agc-title">
-							分成比例
-						</view>
-						<view class="agc-detail">
-							5%
-						</view>
-					</view>
-					<view class="ags-cell u-border-bottom">
-						<view class="agc-title">
-							状态
-						</view>
-						<view class="agc-detail">
-							到账
-						</view>
-					</view>
-					<view class="ags-cell">
-						<view class="agc-title">
-							时间
-						</view>
-						<view class="agc-detail">
-							2023-11-24 15:45:56
-						</view>
-					</view>
-					<u-gap height="10rpx" bgColor="#F7F7F7"></u-gap>
-				</view>
-				<view class="loadmore">
-					下拉加载更多
 				</view>
+
+				<view class="load-more" @click="getOrderList">{{ hasMore ? '加载更多数据...' : '已加载完毕' }}</view>
 			</view>
 
 		</view>
@@ -142,22 +76,43 @@
 
 <script>
 	import {
-		agentAccountInfo
+		agentAccountInfo,
+		agentOrderList
 	} from '../../common/api.js'
 
 	export default {
 		data() {
 			return {
 				accountInfo: {},
+				orderList: [],
+				hasMore: true,
+				page: 0,
 			}
 		},
 		onLoad() {
 			this.getAccountInfo();
+			this.getOrderList();
+		},
+		onReachBottom() {
+			this.getOrderList()
 		},
 		methods: {
 			getAccountInfo() {
 				agentAccountInfo().then(data => this.accountInfo = data)
 			},
+			getOrderList() {
+				if (!this.hasMore) {
+					return
+				}
+				this.page++
+				agentOrderList({
+					page: this.page,
+					page_size: 15
+				}).then(data => {
+					this.orderList = [...this.orderList, ...data.list]
+					this.hasMore = data.has_more
+				})
+			},
 			cashManager() {
 				uni.navigateTo({
 					url: '/pages/cash/cash'
@@ -346,4 +301,77 @@
 		font-size: 24rpx;
 		color: #fff;
 	}
+	
+	.ordering-information {
+		padding: 30rpx;
+		background: #fff;
+		margin-top: 20rpx;
+		border-radius: 20rpx;
+		padding-top: 0;
+	}
+	
+	.order-number {
+		font-family: PingFangSC-Regular, sans-serif;
+		font-size: 26rpx;
+		color: #454545;
+		padding: 30rpx 0;
+	}
+	
+	.ordering-pic {
+		width: 120rpx;
+		height: 120rpx;
+		background-size: cover;
+		border-radius: 15rpx;
+	}
+	
+	image.order-chart {
+		width: 120rpx;
+		height: 120rpx;
+		background-size: cover;
+		border-radius: 15rpx;
+	}
+	
+	.ordering-text {
+		margin-left: 30rpx;
+	}
+	
+	.ordering-text-title {
+		font-family: PingFangSC-Regular, sans-serif;
+		font-size: 30rpx;
+		color: #454545;
+	}
+	
+	.amount-of-money {
+		font-family: PingFangSC-Regular, sans-serif;
+		font-size: 24rpx;
+		color: #999;
+		padding: 2rpx 0;
+	}
+	
+	span.price-style {
+		font-family: PingFangSC-Regular, sans-serif;
+		font-size: 24rpx;
+		color: #F52F3E;
+	}
+	
+	.order-time {
+		font-family: PingFangSC-Regular, sans-serif;
+		font-size: 24rpx;
+		color: #999;
+		padding: 2rpx 0;
+	}
+	
+	.ordering-item-content {
+		display: flex;
+		justify-content: left;
+		align-items: center;
+		border-bottom: 1rpx solid #eee;
+		padding-bottom: 30rpx;
+	}
+	
+	
+	.load-more {
+		text-align: center;
+		font-size: 14px;
+	}
 </style>
\ No newline at end of file