From c1110436afb5cca1a68a9b881c34cd2336b1cc56 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 11 九月 2024 17:30:05 +0800
Subject: [PATCH] 1
---
sub_pages/customer/shopping/confirm.vue | 19 +++++++++++--------
sub_pages/customer/coupon/good-self.vue | 3 ++-
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/sub_pages/customer/coupon/good-self.vue b/sub_pages/customer/coupon/good-self.vue
index 440d59d..1318fb2 100644
--- a/sub_pages/customer/coupon/good-self.vue
+++ b/sub_pages/customer/coupon/good-self.vue
@@ -197,9 +197,10 @@
font-weight: 600;
font-size: 36rpx;
color: #333333;
- line-height: 60rpx;
+ line-height: 50rpx;
text-align: left;
position: relative;
+ margin-top: 20rpx;
.select-coupon{
position: absolute;
right: 10rpx;
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 68206fb..49dbcc1 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -242,7 +242,7 @@
})
tmp.$message.hideLoading()
if (code === 0) {
-
+
//提交信息
console.log('pay,', data)
// /api/pub/init/callback?orderId=
@@ -273,9 +273,9 @@
//返回上一页
await tmp.$store.dispatch('sign_add', 'shopping')
//清空优惠券
- this.$store.dispatch('cache_coupon_select', {})
- this.$store.dispatch('cache_goods_select', [])
-
+ tmp.$store.dispatch('cache_coupon_select', {})
+ tmp.$store.dispatch('cache_goods_select', [])
+
tmp.$message.showToast('支付成功')
setTimeout(() => {
uni.navigateBack()
@@ -437,13 +437,14 @@
</view>
</view>
</view>
- <view class="form-item flex ">
+ <view class="form-item flex flex-wrap-normal">
<view class="label">兑换券</view>
- <view class="m-l-a m-r-0 flex "
+ <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">
- <view>{{dto.goodsRecordIdListStr|| '请选择'}}</view>
+ {{dto.goodsRecordIdListStr|| '请选择'}}
+ <!-- <view>{{dto.goodsRecordIdListStr|| '请选择'}}</view> -->
<u-icon class="m-l-a" name="arrow-right"></u-icon>
</view>
</view>
@@ -470,7 +471,9 @@
</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>
+ 优惠({{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