From 2260705fe189aadbda6c41ecf51238ff5fd52d63 Mon Sep 17 00:00:00 2001
From: yangrz <yangrz@vip.qq.com>
Date: Tue, 2 Apr 2024 11:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=88=86=E6=88=90=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E3=80=81=E6=89=8B=E7=BB=AD=E8=B4=B9=E3=80=81=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E6=94=B6=E7=9B=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agentApp/pages/merchant-index/index.vue | 47 ++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/agentApp/pages/merchant-index/index.vue b/agentApp/pages/merchant-index/index.vue
index c3f40c7..b208ff4 100644
--- a/agentApp/pages/merchant-index/index.vue
+++ b/agentApp/pages/merchant-index/index.vue
@@ -2,9 +2,10 @@
 	<view class="app-container">
 		<view class="agent-content">
 			<view class="avatar-information">
-				<image v-if="accountInfo.logo" style="width: 110rpx;height: 110rpx; border-radius: 50%;" :src="accountInfo.logo"
-					alt="" />
-				<image v-else style="width: 110rpx;height: 110rpx;" src="/static/index/head-sculpture.png" alt="" />
+				<view class="avatar-container">
+					<image class="avatar-img" v-if="accountInfo.logo" :src="accountInfo.logo" alt="" />
+					<image class="avatar-img" v-else src="/static/index/head-sculpture.png" alt="" />
+				</view>
 				<view class="information-content">
 					<view class="information-name">{{accountInfo.name}}</view>
 					<view class="address-text">地址：{{accountInfo.address || '未填写地址'}}</view>
@@ -68,7 +69,14 @@
 						</view>
 						<view class="ordering-text">
 							<view class="ordering-text-title">{{accountInfo.name}}</view>
-							<view class="amount-of-money">金额：<span class="price-style">￥{{order.amount}}</span></view>
+							<view class="amount-list">
+								<view class="amount-of-money">订单金额：<span class="price-style">￥{{order.amount}}</span></view>
+								<view class="amount-of-money">分成金额：<span class="price-style">￥{{share_amount(order)}}</span></view>
+							</view>
+							<view class="amount-list">
+								<view class="amount-of-money">扣手续费：<span class="price-style">￥{{order.merchant_fee}}</span></view>
+								<view class="amount-of-money">实际收益：<span class="price-style">￥{{order.merchant_income}}</span></view>
+							</view>
 							<view class="order-time">订单时间：{{order.paid_at}}</view>
 						</view>
 					</view>
@@ -153,6 +161,9 @@
 				// uni.navigateTo({
 				// 	url: '/pages/user-orders/user-orders'
 				// });
+			},
+			share_amount: function(order) {
+				return (parseFloat(order.merchant_income) + parseFloat(order.merchant_fee)).toFixed(2)
 			}
 		}
 	}
@@ -170,12 +181,25 @@
 		box-sizing: border-box;
 
 		.avatar-information {
-			display: flex;
-			justify-content: left;
-			align-items: center;
+			//display: flex;
+			//justify-content: left;
+			//align-items: center;
 			padding: 30rpx 0;
+			
+			.avatar-container {
+				display: inline-block;
+				width: 120rpx;
+				
+				.avatar-img {
+					width: 110rpx;
+					height: 110rpx;
+					border-radius: 50%;
+				}
+			}
 
 			.information-content {
+				display: inline-block;
+				width: calc(100% - 120rpx - 30rpx);
 				margin-left: 30rpx;
 
 				.information-name {
@@ -347,18 +371,25 @@
 
 					.ordering-text {
 						margin-left: 30rpx;
+						width: 100%;
+						line-height: 110%;
 
 						.ordering-text-title {
 							font-family: PingFangSC-Regular, sans-serif;
 							font-size: 30rpx;
 							color: #454545;
 						}
+						
+						.amount-list {
+							display: flex;
+							justify-content: flex-start;
+						}
 
 						.amount-of-money {
 							font-family: PingFangSC-Regular, sans-serif;
 							font-size: 24rpx;
 							color: #999;
-							padding: 10rpx 0;
+							width: 50%;
 
 							span.price-style {
 								font-family: PingFangSC-Regular, sans-serif;