From 5dfb2c3ecb5792cc675171634bc21fca80b83ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=96=B9=E6=88=90?= <zfc9393@163.com>
Date: Fri, 2 Jan 2026 18:03:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9C=A8=E6=94=AF=E4=BB=98=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E4=B8=AD=E5=AE=9E=E7=8E=B0=E5=A4=9A=E6=AC=A1=E5=8D=A1?=
 =?UTF-8?q?=E4=B8=8E=E4=BC=98=E6=83=A0=E5=88=B8=E4=BA=92=E6=96=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E5=8D=A1=E5=90=AF=E7=94=A8=E6=97=B6=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E4=BC=98=E6=83=A0=E5=88=B8=E9=80=89=E6=8B=A9=E5=B9=B6?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=B7=B2=E9=80=89=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/PaymentPopup.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/components/PaymentPopup.vue b/components/PaymentPopup.vue
index 81a4521..70d244e 100644
--- a/components/PaymentPopup.vue
+++ b/components/PaymentPopup.vue
@@ -70,9 +70,12 @@
               range-key="name"
               @change="onCouponChange"
               :value="couponIndex"
-              :disabled="!coupons || coupons.length === 0"
+              :disabled="(!coupons || coupons.length === 0) || useGamePass"
             >
-              <view class="picker-display">
+              <view class="picker-display" :class="{ 'picker-disabled': useGamePass }">
+                <text v-if="useGamePass" class="placeholder" style="color: #666;">
+                  多次卡不可与优惠券同享
+                </text>
                 <text v-if="selectedCoupon" class="selected-text">
                   {{ selectedCoupon.name }} (-¥{{ effectiveCouponDiscount.toFixed(2) }})
                   <text v-if="selectedCoupon.amount > maxDeductible" style="font-size: 20rpx; color: #FF9800;">(最高抵扣50%)</text>
@@ -216,6 +219,10 @@ watch(() => props.visible, (newVal) => {
 
 function toggleGamePass() {
   useGamePass.value = !useGamePass.value
+  // Mutually Exclusive: If Game Pass is ON, clear Coupon.
+  if (useGamePass.value) {
+    couponIndex.value = -1
+  }
 }
 
 const selectedCoupon = computed(() => {