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 |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mini-program/pages/confirm-order/confirm-order.vue b/mini-program/pages/confirm-order/confirm-order.vue
index fc981e8..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">
@@ -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
 				})
 			},
 			// 纭畾浣跨敤绉垎
@@ -724,7 +725,7 @@
 				font-weight: 500;
 				font-size: 32rpx;
 				color: #FFFFFF;
-				margin-top: 60rpx;
+				margin: 60rpx 0 30rpx 0;
 			}
 			.coupon-content {
 				width: 100%;

--
Gitblit v1.9.3