From ffd407012d000d1a1b9d36c01646d2cdb22675b4 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 11 十月 2024 15:12:21 +0800
Subject: [PATCH] 1.优惠券规则修改 2.已使用的优惠券样式修改

---
 sub_pages/supplier/order-settlement/order-settlement-detail.vue |   55 +++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/sub_pages/supplier/order-settlement/order-settlement-detail.vue b/sub_pages/supplier/order-settlement/order-settlement-detail.vue
index e2b9bfb..68b8a6a 100644
--- a/sub_pages/supplier/order-settlement/order-settlement-detail.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement-detail.vue
@@ -60,7 +60,7 @@
 							<view class="label">结算单价</view>
 						</view>
 						<view class="tj-each flex1">
-							<view class="value">{{dto.flowerNum||'0.00'}}</view>
+							<view class="value">{{dto.flowerNum||'0'}}扎</view>
 							<view class="label">商品数量</view>
 						</view>
 						<view class="tj-each flex1">
@@ -75,20 +75,38 @@
 
 					<view class="tj-container m-t-12 flex">
 						<view class="tj-each flex1">
-							<view class="value">{{dto.serviceFee}}</view>
-							<view class="label">服务费</view>
-						</view>
-						<view class="tj-each flex1">
 							<view class="value">{{dto.salesFee}}</view>
 							<view class="label">售后理赔</view>
 						</view>
 						<view class="tj-each flex1">
+							<view class="value">{{dto.lackFee}}</view>
+							<view class="label">缺货扣款</view>
+						</view>
+						<view class="tj-each flex1">
+							<view class="value">{{dto.replaceFee}}</view>
+							<view class="label">补货扣款</view>
+						</view>
+						<view class="tj-each flex1">
 							<view class="value">{{dto.checkFee}}</view>
-							<view class="label">质检扣款</view>
+							<view class="label">降级扣款</view>
+						</view>
+					</view>
+					<view class="tj-container m-t-12 flex">
+						<view class="tj-each flex1">
+							<view class="value">{{dto.serviceFee}}</view>
+							<view class="label">服务费</view>
 						</view>
 						<view class="tj-each flex1">
 							<view class="value">{{dto.stationFee}}</view>
 							<view class="label">集货站运费</view>
+						</view>
+						<view class="tj-each flex1">
+							<view class="value">&nbsp;</view>
+							<view class="label">&nbsp;</view>
+						</view>
+						<view class="tj-each flex1">
+							<view class="value">&nbsp;</view>
+							<view class="label">&nbsp;</view>
 						</view>
 					</view>
 				</view>
@@ -137,8 +155,18 @@
 								<view class="value">￥{{item.totalAmount||0}}</view>
 							</view>
 							<view class="form-item">
-								<view class="label">质检扣款</view>
+								<view class="label">降级扣款</view>
 								<view class="value">￥{{item.checkFee||'0.00'}}</view>
+							</view>
+						</view>
+						<view class="flex">
+							<view class="form-item">
+								<view class="label">缺货扣款</view>
+								<view class="value">￥{{item.lackFee||'0.00'}}</view>
+							</view>
+							<view class="form-item">
+								<view class="label">补货扣款</view>
+								<view class="value">￥{{item.replaceFee||'0.00'}}</view>
 							</view>
 						</view>
 						<view class="flex">
@@ -171,9 +199,12 @@
 			}
 		},
 		onLoad(options) {
+			console.log('options',options)
 			this.id = options.id || ''
-			if (this.id)
-				this.getList()
+			if (this.id){
+				this.getDetail()
+				
+			}
 
 		},
 
@@ -186,7 +217,7 @@
 				// #ifdef PUB_PARTNER
 				turl = '/api/partner/settlement/list/view?id='
 				// #endif
-
+				console.log('turl',turl)
 
 
 				this.$message.showLoading()
@@ -266,8 +297,8 @@
 			}
 
 			.form {
-				display: flex;
-				flex-wrap: wrap;
+				// display: flex;
+				// flex-wrap: wrap;
 
 				.form-item {
 					flex: 1;

--
Gitblit v1.9.3