From 53dcd1f7886b7e29ac391307f473092429304fca Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sun, 28 Sep 2025 10:11:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/orderInfo.vue |  6 +----
 pages/order/confirm-order.vue        |  9 +-------
 pages/order/detail.vue               | 34 +++++++++++++++-------------
 3 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue
index f13dafd..b81d0bd 100644
--- a/pages/order/components/orderInfo.vue
+++ b/pages/order/components/orderInfo.vue
@@ -82,7 +82,7 @@
 					<view class="val">
 						<view></view>
 						<view style="font-size: 28rpx;">￥</view>
-						<view>{{packfee }}</view>
+						<view>{{cartStore.orderCostSummary.packFee }}</view>
 					</view>
 				</view>
 
@@ -312,10 +312,6 @@
 			type: Boolean,
 			default: false
 		},
-		packfee: {
-			type: [Number, String],
-			default: 0
-		},
 		freeCheck: {
 			type: Boolean
 		},
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 517edf6..1211aa8 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -918,17 +918,10 @@
 			url: '/pages/product/index'
 		})
 	}
-	//打包费
-	const packfee = computed(() => {
-		const historyOrderPackfee = listinfo.packFeess ? listinfo.packFeess * 1 : 0;
-		const nowCartsPackFee = is_type.value ? cartStore.totalPackFee * 1 : 0;
-		const total = historyOrderPackfee + nowCartsPackFee
-		return total
-	})
 	//不计算各种折扣前的实付金额
 	const shifu = computed(() => {
 		const payAmount = listinfo.payAmount ? listinfo.payAmount * 1 : 0
-		return payAmount + cartStore.totalPrice * 1 + packfee.value * 1
+		return payAmount + cartStore.totalPrice * 1 + 0;
 	})
 	//减去各种折扣后的金额
 	const lastPayMoney = computed(() => {
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 83230d7..6a65c6e 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -400,22 +400,24 @@
 	const goToPay = async () => {
 		// 余额支付
 		if (paymentmethod.payType == 'accountPay') {
-			if (orderVIP.value.isVip == 0) {
-				uni.showModal({
-					title: '提示',
-					content: '您还不是会员,是否去注册会员？',
-					success: (res) => {
-						if (res.confirm) {
-							uni.pro.navigateTo('user/member/index', {
-								shopId: orderVIP.value.shopId,
-								type: 'detail'
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				})
-			} else if (orderVIP.value.payPwd == '') {
+			// if (orderVIP.value.isVip == 0) {
+			// 	uni.showModal({
+			// 		title: '提示',
+			// 		content: '您还不是会员,是否去注册会员？',
+			// 		success: (res) => {
+			// 			if (res.confirm) {
+			// 				uni.pro.navigateTo('user/member/index', {
+			// 					shopId: orderVIP.value.shopId,
+			// 					type: 'detail'
+			// 				})
+			// 			} else if (res.cancel) {
+			// 				console.log('用户点击取消');
+			// 			}
+			// 		}
+			// 	})
+			//return
+			// } 
+			 if (orderVIP.value.payPwd == '') {
 				uni.showModal({
 					title: '提示',
 					content: '您还未设置支付密码，是否去设置？',