From 03eca9cdec1d290be4be60d4d9d5038257b93586 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 14 九月 2024 18:29:40 +0800
Subject: [PATCH] updat 合伙人

---
 pages/order/order-detail.vue |   56 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 6692025..5526c16 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -15,19 +15,7 @@
 				type: 'partner',
 				// #endif
 				salesTypeDef: 0,
-				salesTypeList: [{
-						label: '请选择售后类型',
-						value: '',
-					},
-					{
-						label: '换货',
-						value: 'barters',
-					},
-					{
-						label: '退货',
-						value: 'returns',
-					},
-				],
+				salesTypeList: [],
 			};
 		},
 		onUnload() {
@@ -98,6 +86,28 @@
 
 
 			}
+
+			this.$http.request('get', '/api/code/value', {
+				params: {
+					type: 'after_sale_type'
+				}
+			}).then(res => {
+				var data = res.data;
+	
+				let tmpData = data.map(item => ({
+					value: item.value,
+					label: item.label
+				}));
+
+				// 将 '全部' 选项插入到 tmpData 的开头
+				this.salesTypeList = tmpData;
+				this.salesTypeList.unshift({
+					label: '全部',
+					value: ''
+				});
+
+			})
+
 		},
 		methods: {
 			salesTypeChange(e) {
@@ -585,25 +595,25 @@
 			</view>
 		</view>
 		<view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
-			<view class="form-item">
+			<view class="form-item flex">
 				<view class="label">订单金额:</view>
-				<view class="value">+{{ dto.totalAmount || '0' }}</view>
+				<view class="value m-l-a m-r-0 text-right">+{{ dto.totalAmount || '0' }}</view>
 			</view>
-			<view class="form-item">
+			<view class="form-item flex">
 				<view class="label">运费:</view>
-				<view class="value">+{{ dto.transportFee || '0' }}</view>
+				<view class="value  m-l-a m-r-0 text-right">+{{ dto.transportFee || '0' }}</view>
 			</view>
-			<view class="form-item">
+			<view class="form-item flex">
 				<view class="label">打包费:</view>
-				<view class="value">+{{ dto.packingFee || '0' }}</view>
+				<view class="value  m-l-a m-r-0 text-right">+{{ dto.packingFee || '0' }}</view>
 			</view>
-			<view class="form-item t-red">
+			<view class="form-item flex t-red">
 				<view class="label">优惠:</view>
-				<view class="value">-{{ dto.memberCouponAmount || '0' }}</view>
+				<view class="value  m-l-a m-r-0 text-right">-{{ dto.memberCouponAmount || '0' }}</view>
 			</view>
-			<view class="form-item t-red">
+			<view class="form-item flex t-red">
 				<view class="label">实际支付:</view>
-				<view class="value">¥{{ dto.paymentAmount || '0' }}</view>
+				<view class="value  m-l-a m-r-0 text-right">¥{{ dto.paymentAmount || '0' }}</view>
 			</view>
 
 

--
Gitblit v1.9.3