From 23eb4337693b4e9021bcda55844dc92e6a4004b8 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 12 九月 2024 11:17:14 +0800
Subject: [PATCH] update 会员积分相关的优化
---
pages/order/order-detail.vue | 57 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index eca56b0..bc12076 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -14,9 +14,8 @@
// #ifdef PUB_PARTNER
type: 'partner',
// #endif
- salesTypeDef:0,
- salesTypeList:[
- {
+ salesTypeDef: 0,
+ salesTypeList: [{
label: '请选择售后类型',
value: '',
},
@@ -46,7 +45,7 @@
orderId: this.id,
// imageList: [],
videoList: [],
- salesType:'',
+ salesType: '',
reason: '',
// orderItems: [],
orderItemId: options.flowerId || '',
@@ -101,7 +100,7 @@
}
},
methods: {
- salesTypeChange(e){
+ salesTypeChange(e) {
this.submitForm.salesType = e.value
},
@@ -587,9 +586,27 @@
<view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
<view class="form-item">
<view class="label">订单金额:</view>
- <view class="value">{{ dto.totalAmount || '-' }}</view>
+ <view class="value">+{{ dto.totalAmount || '0' }}</view>
</view>
<view class="form-item">
+ <view class="label">运费:</view>
+ <view class="value">+{{ dto.transportFee || '0' }}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">打包费:</view>
+ <view class="value">+{{ dto.packingFee || '0' }}</view>
+ </view>
+ <view class="form-item t-red">
+ <view class="label">优惠:</view>
+ <view class="value">-{{ dto.memberCouponAmount || '0' }}</view>
+ </view>
+ <view class="form-item t-red">
+ <view class="label">实际支付:</view>
+ <view class="value">￥{{ dto.paymentAmount || '0' }}</view>
+ </view>
+
+
+ <!-- <view class="form-item">
<view class="label">支付金额:</view>
<view class="value">{{ dto.paymentAmount || '-' }}</view>
</view>
@@ -597,11 +614,23 @@
<view class="label">商品金额:</view>
<view class="value">{{ dto.flowerAmount || '-' }}</view>
</view>
+
<view class="form-item">
- <view class="label">运费:</view>
- <view class="value">{{ dto.transportFee || '-' }}</view>
+ <view class="label">折扣类型:</view>
+ <view class="value">{{ dto.memberDiscountTypeStr || '-' }}</view>
</view>
-
+ <view class="form-item">
+ <view class="label">优惠金额（每扎）:</view>
+ <view class="value">￥{{ dto.memberDiscountAmount || '-' }}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">优惠券:</view>
+ <view class="value">{{ dto.memberCouponName || '-' }}</view>
+ </view> -->
+ <!-- <view class="form-item">
+ <view class="label">优惠金额:</view>
+ <view class="value">{{ dto.memberCouponAmount || '-' }}</view>
+ </view> -->
</view>
<view class="info-container bg-white br-4 m-t-12"
v-if="!showSales&& dto.pointGoodsList&& dto.pointGoodsList.length>0">
@@ -624,7 +653,8 @@
</view>
<view class="each-item" style="min-width: unset;max-width: unset;">
<view class="label" style="min-width: 55rpx;">描述</view>
- <view class="value" style="word-break: break-all;text-align: left;">{{ item.description || '-' }}
+ <view class="value" style="word-break: break-all;text-align: left;">
+ {{ item.description || '-' }}
</view>
</view>
</view>
@@ -670,16 +700,17 @@
class="form-input"></input>
</view>
</view>
-
+
<view class="form-item">
<view class="form-item-label require">
售后类型
</view>
<view class="form-item-value">
- <um-dropdown @change="salesTypeChange" :defaultIndex="salesTypeDef" rangeKey="label" :optionList="salesTypeList" placeholder="售后类型"></um-dropdown>
+ <um-dropdown @change="salesTypeChange" :defaultIndex="salesTypeDef" rangeKey="label"
+ :optionList="salesTypeList" placeholder="售后类型"></um-dropdown>
</view>
</view>
-
+
<view class="form-item">
<view class="form-item-label require">
理由
--
Gitblit v1.9.3