From 36f92cc6805f77d14552b4d06dfcd30641131ee1 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 30 Sep 2025 18:04:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A1=AE=E8=AE=A4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BD=99=E9=A2=9D=E6=94=AF=E4=BB=98=EF=BC=8C=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D=E5=85=85=E8=B6=B3=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/orderInfo.vue | 36 +++++++++-------------------
 pages/order/confirm-order.vue        |  8 +++----
 2 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue
index 01bd895..4417cc6 100644
--- a/pages/order/components/orderInfo.vue
+++ b/pages/order/components/orderInfo.vue
@@ -159,11 +159,14 @@
 									</text>
 								</template>
 
+								<template v-else>
+									<view v-if="maxPointDiscount>0" class="u-flex u-col-center">
+										<view class="round"></view>
+										<text class="color-333 font-12 no-wrap u-m-l-4">使用抵扣</text>
+									</view>
+
+								</template>
 
-								<view v-else class="u-flex u-col-center">
-									<view class="round"></view>
-									<text class="color-333 font-12 no-wrap u-m-l-4">使用抵扣</text>
-								</view>
 							</view>
 							<!-- <view class="favorable_right" v-if="item.type=='points'">
 								<text class="favorable_right_text" style="color: #666;margin-right: 16rpx;"
@@ -232,10 +235,6 @@
 		</view>
 
 
-		<IntegralInput :visible="calcUsablePointsData.showModal" :minValue="calcUsablePointsData.minIntegral"
-			:maxValue="calcUsablePointsData.maxIntegral" :instructions="calcUsablePointsData.instructionText"
-			@confirm="handleConfirm" @close="calcUsablePointsData.showModal = false"
-			@IntegralInputclose="IntegralInputclose" />
 	</view>
 
 </template>
@@ -439,6 +438,9 @@
 				break;
 
 			case 'points':
+				if (maxPointDiscount.value <= 0) {
+					return
+				}
 				chnageIsUsePoints()
 				return
 		}
@@ -472,7 +474,7 @@
 		})
 		Object.assign(pointsRes, res)
 		maxPointDiscount.value = res.maxDeductionAmount
-		cartStore.setUserPoints(res.maxUsablePoints||0)
+		cartStore.setUserPoints(res.maxUsablePoints || 0)
 		console.log('getMaxPointsDiscount:cartStore.orderCostSummary.pointUsed', cartStore.orderCostSummary.pointUsed);
 	}
 	watch(() => maxMoney.value, (newval) => {
@@ -490,22 +492,6 @@
 
 	})
 
-	const handleConfirm = async (integral) => {
-		//积分可抵扣最大金额
-		const maxMoney = cartStore.orderCostSummary.goodsRealAmount - cartStore.orderCostSummary
-			.couponDeductionAmount
-		calcUsablePointsData.integral = integral
-		props.listinfo.pointsDiscountAmount = await APImemberPointscalcDeductionAmount({
-			points: integral,
-			shopUserId: props.orderVIP.id,
-			orderAmount: maxMoney
-		})
-		cartStore.setUserPoints(integral)
-		emits('clickPointsamount', {
-			pointsDiscountAmount: props.listinfo.pointsDiscountAmount,
-			pointsNum: calcUsablePointsData.integral
-		});
-	};
 
 	// * 获取积分相关信息
 	const getCalcUsablePoints = async (data) => {
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 3ad9e53..81fe261 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -216,6 +216,7 @@
 
 	function updateChargeSel(newval) {
 		rechargeItem.value = newval
+		console.log('updateChargeSel',newval);
 		//充值并付款时只能微信支付
 		if (newval && newval.id) {
 			disablePayType.value = ['余额支付']
@@ -224,15 +225,14 @@
 			disablePayType.value = []
 		}
 		
-
-		if (!shopUserInfo.value.amount) {
+		if (!orderVIP.value.amount) {
 			disablePayType.value = ['余额支付']
 			if (paymentMethodref.value) {
 				paymentMethodref.value.groupChanges(2)
 			}
 			return
 		}
-		if (shopUserInfo.value.amount < newval) {
+		if (orderVIP.value.amount < newval) {
 			disablePayType.value = ['余额支付']
 			if (paymentMethodref.value) {
 				paymentMethodref.value.groupChanges(2)
@@ -1103,10 +1103,8 @@
 		}
 
 	}
-	const shopUserInfo = ref({})
 	onLoad((opt) => {
 		init(opt)
-		shopUserInfo.value = uni.cache.get('shopUserInfo')
 	})
 </script>