From e8d258576a34f35cfefbd6bfe07b7f22e72d87d4 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 九月 2024 10:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/v2' into v2
---
sub_pages/customer/shopping/confirm.vue | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index c88048e..e97c9b9 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -25,7 +25,8 @@
if (this.cache_coupon.couponDiscountType === 'zero') {
return this.cache_coupon.couponDiscountValue || 0
} else if (this.cache_coupon.minOrderAmount && this.cache_coupon.minOrderAmount > 0) {
- var total = ((dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) || 0)
+ var total = ((this.dto.totalAmount || 0) + (this.dto.packing || 0) + (this.current_transport.fee ||
+ 0) || 0)
.toFixed(2)
if (total >= this.cache_coupon.minOrderAmount) {
return this.cache_coupon.couponDiscountValue || 0
@@ -51,14 +52,14 @@
this.dto.couponRecordStr = this.cache_coupon.couponName
}
//兑换券
- this.dto.couponRecordStr = ''
+ this.dto.goodsRecordIdListStr = ''
if (this.cache_goods && this.cache_goods.length > 0) {
- this.dto.couponRecordStr = ''
+ this.dto.goodsRecordIdListStr = ''
var names = []
for (var tmp of this.cache_goods) {
names.push(tmp.name || tmp.title || '')
}
- this.dto.couponRecordStr = names.join(',')
+ this.dto.goodsRecordIdListStr = names.join(',')
}
},
onLoad(options) {
@@ -216,6 +217,12 @@
return
}
this.dto.addressId = this.address.id
+ var goodsRecordIds = []
+ if (this.dto.goodsRecordIdListStr) {
+ for (var t of this.cache_goods) {
+ t.push(t.goodsId)
+ }
+ }
let tmp = this
wx.login({
@@ -229,15 +236,13 @@
} = await tmp.$http.request('post', '/api/customer/flower/order/commit', {
data: {
...tmp.dto,
- wxcode: res.code
+ wxcode: res.code,
+ goodsRecordIdList: goodsRecordIds
}
})
tmp.$message.hideLoading()
if (code === 0) {
- //清空优惠券
- this.$store.dispatch('cache_coupon_select', {})
- this.$store.dispatch('cache_goods_select', [])
-
+
//提交信息
console.log('pay,', data)
// /api/pub/init/callback?orderId=
@@ -267,6 +272,10 @@
// tmp.$message.showToast('支付成功')
//返回上一页
await tmp.$store.dispatch('sign_add', 'shopping')
+ //清空优惠券
+ this.$store.dispatch('cache_coupon_select', {})
+ this.$store.dispatch('cache_goods_select', [])
+
tmp.$message.showToast('支付成功')
setTimeout(() => {
uni.navigateBack()
@@ -324,7 +333,7 @@
style="display: inline-block;">{{ item.levelStr || '' }}</span>{{ item.name || '-' }}
</view>
<view class="price">
- {{ item.price || 0 }}*{{ item.num }}扎
+ {{ item.priceMember || item.price || 0 }}*{{ item.num }}扎
</view>
<view class="desc m-t-12">
<view class="m-r-15">每扎重量:{{ item.weight || 0 }}</view>
@@ -398,7 +407,6 @@
</view>
<view class="p10 bg-white m-t-20 br-4">
- <!-- #ifdef PUB_CUSTOMER_DEV -->
<view class="form-item flex ">
<view class="label">优惠券</view>
@@ -408,7 +416,6 @@
<u-icon class="m-l-a" name="arrow-right"></u-icon>
</view>
</view>
- <!-- #endif -->
<view class="form-item flex m-t-12">
<view class="label">特殊需求</view>
@@ -430,7 +437,6 @@
</view>
</view>
</view>
- <!-- #ifdef PUB_CUSTOMER_DEV -->
<view class="form-item flex ">
<view class="label">兑换券</view>
@@ -441,7 +447,6 @@
<u-icon class="m-l-a" name="arrow-right"></u-icon>
</view>
</view>
- <!-- #endif -->
</view>
</view>
@@ -464,8 +469,8 @@
{{ (current_transport.fee || 0) }}
</view>
</view>
- <view class="desc flex">
- <view>优惠:</view>
+ <view class="desc flex" v-if="cache_coupon&&cache_coupon.id">
+ <view>优惠({{cache_coupon.couponDiscountType=='zero'?'无门槛':(cache_coupon.minOrderAmount?(`满￥${cache_coupon.minOrderAmount}可用`):'无门槛')}},优惠￥{{cache_coupon.couponDiscountValue||'0'}}):</view>
<view class="m-l-a m-r-0 text-right">
-{{ coupon_fee || 0 }}
</view>
--
Gitblit v1.9.3