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 | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 111 insertions(+), 6 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index a7e0920..bc12076 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()
@@ -101,7 +119,12 @@
if (code === 0) {
this.dto = {
...this.dto,
- ...data
+ ...data,
+ // pointGoodsList: [{
+ // name: '1',
+ // num: 1,
+ // description: 'descriptiondescriptiondescriptiondescriptiondescription'
+ // }]
}
}
},
@@ -223,6 +246,7 @@
id: this.id,
}
})
+
this.$message.hideLoading()
if (code === 0) {
//微信接口
@@ -373,6 +397,10 @@
this.$message.showToast('售后数量需要大于0')
return
}
+ if (!this.submitForm.salesType) {
+ this.$message.showToast('未填写售后类型')
+ return
+ }
if (!this.submitForm.reason) {
this.$message.showToast('未填写理由')
return
@@ -398,7 +426,7 @@
// this.showSales = false
// this.$forceUpdate()
// setTimeout(() => {
- // uni.navigateBack()
+ // uni.navigateBack()
// }, 1200)
}
},
@@ -435,7 +463,8 @@
</view>
</view>
<view v-for="(item,index) of list" :key="index">
- <view class="flower-info m-b-20 m-t-12 br-4" v-if="!showSales||showSales&&(submitForm.orderItemId == item.id)">
+ <view class="flower-info m-b-20 m-t-12 br-4"
+ v-if="!showSales||showSales&&(submitForm.orderItemId == item.id)">
<view class="supplier-name ">
<image class="icon-dp" src="/static/common/icon-dp.png"></image>
{{ item.supplierName || ''}}
@@ -493,6 +522,7 @@
</view>
</view>
+
<view class="info-container bg-white br-4" v-if="!showSales">
<view class="form-item">
<view class="label">订单编号:</view>
@@ -556,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>
@@ -566,10 +614,56 @@
<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">
+ <view v-for="(item,j) of dto.pointGoodsList" :key="j" class="m-b-12">
+ <view class="flower-info br-4">
+ <view class="flex flex-wrap-normal">
+ <image class="flower-img img100 br-4 m-r-6" :src="item.cover" @click="previewImg(item.cover)">
+ </image>
+ <view class="flex1">
+ <view class=" flex">
+ <view class="title">
+ {{ item.name || ''}}
+ </view>
+ </view>
+ <view class="each-list" style="display: contents;">
+ <view class="each-item">
+ <view class="label">数量</view>
+ <view class="value">{{ item.num || 0 }}</view>
+
+ </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>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ </view>
+ </view>
+
</view>
@@ -606,6 +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>
+ </view>
+ </view>
+
<view class="form-item">
<view class="form-item-label require">
理由
--
Gitblit v1.9.3