From 32526e5bddb7b14328b2467cd18783f480b33f3b Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 31 八月 2024 01:51:53 +0800
Subject: [PATCH] update合伙人

---
 sub_pages/supplier/order-settlement/order-settlement.vue |   50 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/sub_pages/supplier/order-settlement/order-settlement.vue b/sub_pages/supplier/order-settlement/order-settlement.vue
index 72251da..6a27d29 100644
--- a/sub_pages/supplier/order-settlement/order-settlement.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement.vue
@@ -18,6 +18,16 @@
 					</view>
 					<view class="line"></view>
 					<view class="form">
+					<!-- 	<view class="flex">
+							<view class="form-item flex1">
+								<view class="label">结算对象</view>
+								<view class="value">{{item.userName||''}}</view>
+							</view>
+							<view class="form-item flex1">
+								<view class="label"></view>
+								<view class="value"></view>
+							</view>
+						</view> -->
 						<view class="flex">
 							<view class="form-item flex1">
 								<view class="label">结算单价/均价</view>
@@ -25,42 +35,41 @@
 							</view>
 							<view class="form-item flex1">
 								<view class="label">商品数量</view>
-								<view class="value">{{item.flowerNum||0}}</view>
+								<view class="value">{{item.flowerNum||0}}扎</view>
 							</view>
 						</view>
 						<view class="flex">
 							<view class="form-item">
 								<view class="label">订单数量</view>
-								<view class="value">{{item.orderNum}}</view>
+								<view class="value">{{item.orderNum}}单</view>
 							</view>
 							<view class="form-item">
 								<view class="label">买家数量</view>
-								<view class="value">{{item.customerNum}}</view>
+								<view class="value">{{item.customerNum}}个</view>
 							</view>
 						</view>
 						<view class="flex">
 							<view class="form-item">
 								<view class="label">服务费</view>
-								<view class="value">{{item.serviceFee}}</view>
+								<view class="value">¥{{item.serviceFee||0}}</view>
 							</view>
 							<view class="form-item">
 								<view class="label">售后理赔</view>
-								<view class="value">{{item.salesFee}}</view>
+								<view class="value">¥{{item.salesFee||0}}</view>
 							</view>
 						</view>
 						<view class="flex">
 							<view class="form-item">
 								<view class="label">质检扣款</view>
-								<view class="value">{{item.checkFee}}</view>
+								<view class="value">¥{{item.checkFee||0}}</view>
 							</view>
 							<view class="form-item">
 								<view class="label">集货站运费</view>
-								<view class="value">{{item.stationFee}}</view>
+								<view class="value">¥{{item.stationFee||0}}</view>
 							</view>
 						</view>
 					</view>
-
-					<view class="line"></view>
+					<!-- <view class="line"></view> -->
 					<view class="form">
 						<view class="flex">
 							<view class="form-item">
@@ -98,11 +107,15 @@
 		onLoad() {
 			var currentMonthStr = this.$util.toDate(new Date()).substring(0, 8) + '01'
 			this.query.startDateStr = currentMonthStr
-			var lastMonthDate = new Date(new Date(this.$util.toDate(new Date(currentMonthStr).getTime() + 3600_000 * 24 *
-				40).substring(0, 8) + '01').getTime() - 3600_000 * 24 * 1)
+			var lastMonthDate = new Date(new Date(this.$util.toDate(new Date(currentMonthStr).getTime() + 3600000 * 24 *
+				40).substring(0, 8) + '01').getTime() - 3600000 * 24 * 1)
 			this.query.endDateStr = this.$util.toDate(lastMonthDate)
-
-			this.listApi = '/api/partner/settlement/list'
+			// #ifdef PUB_PARTNER
+			this.listApi = '/api/partner/settlement/list'			
+			// #endif
+			// #ifdef PUB_SUPPLIER
+			this.listApi = '/api/supplier/settlement/list'						
+			// #endif
 			this.getList()
 
 		},
@@ -139,11 +152,6 @@
 
 				}
 			},
-			toDetail(item) {
-				// uni.navigateTo({
-				// 	url: `/pages/notice/notice?id=${item.id}`
-				// })
-			}
 		}
 	}
 </script>
@@ -169,8 +177,8 @@
 			}
 
 			.form {
-				display: flex;
-				flex-wrap: wrap;
+				// display: flex;
+				// flex-wrap: wrap;
 
 				.form-item {
 					flex: 1;
@@ -197,6 +205,8 @@
 						font-size: 24rpx;
 						color: #000000;
 						line-height: 34rpx;
+						text-align: center;
+						flex: 1;
 					}
 
 					.value.red {

--
Gitblit v1.9.3