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
---
sub_pages/customer/shopping/confirm.vue | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 8be6896..7a9a7fb 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -25,8 +25,9 @@
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 = (( this.dto.totalMemberAmount || this.dto.totalAmount || 0) + (this.dto.packing || 0) + (this.current_transport.fee ||
- 0) || 0)
+ var total = ((this.dto.totalMemberAmount || 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
@@ -50,6 +51,9 @@
if (this.cache_coupon && this.cache_coupon.id) {
this.dto.couponRecordId = this.cache_coupon.id
this.dto.couponRecordStr = this.cache_coupon.couponName
+ } else if (this.cache_coupon && !this.cache_coupon.id) {
+ this.dto.couponRecordId = ''
+ this.dto.couponRecordStr = ''
}
//兑换券
this.dto.goodsRecordIdListStr = ''
@@ -159,8 +163,16 @@
methods: {
toSelectCoupon() {
//跳转去列表页面进行选择
+ var total = ((this.dto.totalMemberAmount || 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
+ // }
+
uni.navigateTo({
- url: '/sub_pages/customer/coupon/coupon-self?source=shopping'
+ url: `/sub_pages/customer/coupon/coupon-self?source=shopping&paymoney=${total}`
})
},
toSelectGood() {
@@ -220,7 +232,7 @@
var goodsRecordIds = []
if (this.dto.goodsRecordIdListStr) {
for (var t of this.cache_goods) {
- t.push(t.id)
+ goodsRecordIds.push(t.id)
}
}
@@ -343,7 +355,8 @@
</view>
<view class="price">
<view class="m-l-a m-r-0 text-right">
- 共{{ dto.flowers.length }}件，小计<span class="t-red">￥{{ dto.totalMemberAmount || dto.totalAmount || 0 }}</span>
+ 共{{ dto.flowers.length }}件，小计<span
+ class="t-red">￥{{ dto.totalMemberAmount || dto.totalAmount || 0 }}</span>
</view>
</view>
</view>
@@ -438,14 +451,17 @@
</view>
</view>
<view class="form-item flex flex-wrap-normal">
- <view class="label">兑换券</view>
+ <view class="label" style="min-width: 130rpx;">兑换券</view>
<view class="m-l-a m-r-0 flex" style="word-break: break-all;"
:class="[!dto.goodsRecordIdList||dto.goodsRecordIdList.length==0?'desc-gray':'']"
@click="toSelectGood">
- {{dto.goodsRecordIdListStr|| '请选择'}}
+ <view> {{dto.goodsRecordIdListStr|| '请选择'}}
+ </view>
<!-- <view>{{dto.goodsRecordIdListStr|| '请选择'}}</view> -->
- <u-icon class="m-l-a" name="arrow-right"></u-icon>
+ <view style="min-width: 60rpx;">
+ <u-icon class="m-l-a" name="arrow-right"></u-icon>
+ </view>
</view>
</view>
</view>
--
Gitblit v1.9.3