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 | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 5b1c334..7a9a7fb 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -170,7 +170,7 @@
// if (total >= this.cache_coupon.minOrderAmount) {
// return this.cache_coupon.couponDiscountValue || 0
// }
-
+
uni.navigateTo({
url: `/sub_pages/customer/coupon/coupon-self?source=shopping&paymoney=${total}`
})
@@ -232,7 +232,7 @@
var goodsRecordIds = []
if (this.dto.goodsRecordIdListStr) {
for (var t of this.cache_goods) {
- t.push(t.id)
+ goodsRecordIds.push(t.id)
}
}
@@ -451,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