From cdca21c0c12fa79ad4e85321d0f0960c0c4c3f33 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 06 三月 2026 10:56:17 +0800
Subject: [PATCH] 优化
---
mini-program/pages/confirm-order/confirm-order.vue | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/mini-program/pages/confirm-order/confirm-order.vue b/mini-program/pages/confirm-order/confirm-order.vue
index a32915c..48ad825 100644
--- a/mini-program/pages/confirm-order/confirm-order.vue
+++ b/mini-program/pages/confirm-order/confirm-order.vue
@@ -89,7 +89,7 @@
<view class="info-item">
<view class="info-item-label">鍟嗗搧鎬讳环</view>
<view class="info-item-price">
- <text>{{orderInfo.amount}}</text>
+ <text>{{((orderInfo.amount || 0)-(orderInfo.mailAmount || 0)).toFixed(2)}}</text>
</view>
</view>
<view class="info-item">
@@ -113,7 +113,7 @@
<view class="info-item">
<view class="info-item-label" style="color: #222222; font-size: 30rpx; font-weight: 600;">搴斾粯娆�</view>
<view class="info-item-price2">
- <text>{{orderInfo.payAmount}}</text>
+ <text>{{(orderInfo.payAmount || 0).toFixed(2)}}</text>
</view>
</view>
</view>
@@ -201,7 +201,7 @@
<view :class="item.active ? 'dian active' : 'dian'" @click="seleShop(index)" v-for="(item, index) in shopList" :key="index">
<view class="dian-top">
<view class="dian-top-image">
- <image :src="item.imgFullUrl" mode="widthFix"></image>
+ <image :src="item.imgFullUrl || '/static/icon/default2.png'" mode="widthFix"></image>
</view>
<view class="dian-top-info">
<view class="dian-top-info-title">
@@ -263,7 +263,7 @@
useIntegralCopy: 0,
useIntegral: 0,
receiveType: 0,
- couponId: null,
+ couponId: -1,
shopId: null,
payDetailRequestList: [],
shopList: [],
@@ -424,7 +424,6 @@
titlePrice: this.orderInfo.payAmount,
shopId: this.shopId ? this.shopId.id : null
}).then(res => {
- this.loading = false
if (res.code === 200) {
// 绉垎鎶垫墸
if (res.data.payType === 1) {
@@ -449,13 +448,15 @@
},
fail (err) {
uni.$emit('shuaxin')
- uni.navigateTo({
+ uni.redirectTo({
url: '/pagesA/pages/order/order?userType=0&status=1'
})
}
})
}
}
+ }).finally(() => {
+ this.loading = false
})
},
// 纭畾浣跨敤绉垎
@@ -469,6 +470,8 @@
let arr = this.orderInfo.memberCouponList.filter(item => item.active)
if (arr.length > 0) {
this.couponId = arr[0].id
+ } else {
+ this.couponId = null
}
this.show = false
this.getOrderInfo()
@@ -476,7 +479,11 @@
// 閫夋嫨浼樻儬鍒�
selectCoupon(i) {
this.orderInfo.memberCouponList.forEach((item, index) => {
- item.active = index === i
+ if (index === i) {
+ item.active = !item.active
+ } else {
+ item.active = false
+ }
})
},
// 鑾峰彇璁㈠崟璇︾粏淇℃伅
@@ -493,7 +500,11 @@
res.data.memberCouponList = []
} else {
res.data.memberCouponList.forEach(item => {
- item.active = false
+ if (res.data.memberCoupon) {
+ item.active = item.id === res.data.memberCoupon.id
+ } else {
+ item.active = false
+ }
})
}
this.orderInfo = res.data
@@ -714,7 +725,7 @@
font-weight: 500;
font-size: 32rpx;
color: #FFFFFF;
- margin-top: 60rpx;
+ margin: 60rpx 0 30rpx 0;
}
.coupon-content {
width: 100%;
@@ -1075,6 +1086,11 @@
flex-direction: column;
justify-content: space-between;
.item-info-title {
+ width: 100%;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
font-weight: 400;
font-size: 30rpx;
color: #222222;
--
Gitblit v1.9.3