From fb48777cd4c3f086f77b5b26e1d03aebf995f4f5 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 18:40:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-2.0' into master-2.0
---
pages/order/order-detail.vue | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 7 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 6018509..c93affa 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -14,6 +14,20 @@
// #ifdef PUB_PARTNER
type: 'partner',
// #endif
+ salesTypeDef: 0,
+ salesTypeList: [{
+ label: '请选择售后类型',
+ value: '',
+ },
+ {
+ label: '换货',
+ value: 'barters',
+ },
+ {
+ label: '退货',
+ value: 'returns',
+ },
+ ],
};
},
onUnload() {
@@ -31,6 +45,7 @@
orderId: this.id,
// imageList: [],
videoList: [],
+ salesType: '',
reason: '',
// orderItems: [],
orderItemId: options.flowerId || '',
@@ -85,6 +100,9 @@
}
},
methods: {
+ salesTypeChange(e) {
+ this.submitForm.salesType = e.value
+ },
async getDetail() {
this.$message.showLoading()
@@ -182,6 +200,7 @@
tmp.$message.hideLoading()
if (code === 0) {
tmp.getDetail()
+ tmp.$store.dispatch('getCurrentInfo')
}
},
fail(e) {
@@ -379,6 +398,10 @@
this.$message.showToast('售后数量需要大于0')
return
}
+ if (!this.submitForm.salesType) {
+ this.$message.showToast('未填写售后类型')
+ return
+ }
if (!this.submitForm.reason) {
this.$message.showToast('未填写理由')
return
@@ -562,11 +585,29 @@
</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 || '-' }}</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 m-l-a m-r-0 text-right">+{{ dto.transportFee || '0' }}</view>
+ </view>
+ <view class="form-item flex">
+ <view class="label">打包费:</view>
+ <view class="value m-l-a m-r-0 text-right">+{{ dto.packingFee || '0' }}</view>
+ </view>
+ <view class="form-item flex t-red">
+ <view class="label">优惠:</view>
+ <view class="value m-l-a m-r-0 text-right">-{{ dto.memberCouponAmount || '0' }}</view>
+ </view>
+ <view class="form-item flex t-red">
+ <view class="label">实际支付:</view>
+ <view class="value m-l-a m-r-0 text-right">￥{{ dto.paymentAmount || '0' }}</view>
+ </view>
+
+
+ <!-- <view class="form-item">
<view class="label">支付金额:</view>
<view class="value">{{ dto.paymentAmount || '-' }}</view>
</view>
@@ -574,11 +615,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">
@@ -601,7 +654,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>
@@ -647,6 +701,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>
+ </view>
+ </view>
+
<view class="form-item">
<view class="form-item-label require">
理由
--
Gitblit v1.9.3