From 64ac69db93e2f1928fd00bda3807a27e632604c0 Mon Sep 17 00:00:00 2001
From: jacobxu666 <jacobxu666@gmail.com>
Date: Fri, 4 Sep 2026 11:42:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95/=E8=AF=A6=E6=83=85=E9=A1=B5=E9=98=B2?=
 =?UTF-8?q?=E6=88=AA=E5=B1=8F=E9=99=90=E5=88=B6=EF=BC=8C=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9D=A1=E6=94=AF=E6=8C=81=E7=BD=AE=E7=81=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B7=B2=E8=BF=87=E9=A2=84=E7=BA=A6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 src/packages/user/pages/reserve/index.vue   |  8 ++++++--
 src/packages/user/pages/reserve/list.vue    | 12 ------------
 src/packages/user/pages/reserve/success.vue | 12 ------------
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/packages/user/pages/reserve/index.vue b/src/packages/user/pages/reserve/index.vue
index cfbd5f5..a74b16c 100644
--- a/src/packages/user/pages/reserve/index.vue
+++ b/src/packages/user/pages/reserve/index.vue
@@ -32,7 +32,7 @@
           >
             <text class="date-week">{{ d.week }}</text>
             <text class="date-day">{{ d.label }}</text>
-            <text v-if="d.disabled" class="date-stock date-stock--empty">不可约</text>
+            <text v-if="d.disabled" class="date-stock date-stock--empty">{{ d.expired ? '已过预约时间' : '不可约' }}</text>
             <text v-else-if="d.stock == null" class="date-stock">无限库存</text>
             <text v-else-if="d.stock >= 50" class="date-stock">可预约</text>
             <text v-else-if="d.stock > 0" class="date-stock">余{{ d.stock }}位</text>
@@ -155,6 +155,8 @@ interface DateOption {
   cards: CardOption[]
   disabled?: boolean
   reason?: string
+  // xuchao: 已过预约截止时间（后端置灰补显的日期，不可点）
+  expired?: boolean
 }
 
 const scenic = ref({ name: '', address: '', hours: '', image: '' })
@@ -269,7 +271,8 @@ onLoad(async (query: any) => {
       userIdCard.value = res.userIdCard || ''
       bookingNotice.value = Array.isArray(res.bookingNotice) ? res.bookingNotice.map((n: any) => (typeof n === 'string' ? n : n?.content || n?.text || '')).join('<br/>') : (res.bookingNotice || '')
       cardModelName.value = res.cardModelName || ''
-      appointmentDays.value = (res.dates || []).length
+      // xuchao: 近N日提示不含过截止置灰补显的日期
+      appointmentDays.value = (res.dates || []).filter((d: any) => !d.expired).length
       reserveParams.value = {
         scenicId: parseInt(resourceId),
         channel: 'Channel_SZH',
@@ -287,6 +290,7 @@ onLoad(async (query: any) => {
         cards: d.cards || [],
         disabled: d.disabled,
         reason: d.reason,
+        expired: d.expired,
       }))
       const firstAvailable = dateOptions.value.find(d => d.stock == null || d.stock > 0)
       if (firstAvailable) selectedDate.value = firstAvailable.key
diff --git a/src/packages/user/pages/reserve/list.vue b/src/packages/user/pages/reserve/list.vue
index 0a82036..e9cbf82 100644
--- a/src/packages/user/pages/reserve/list.vue
+++ b/src/packages/user/pages/reserve/list.vue
@@ -244,9 +244,6 @@ let countdownTimer: ReturnType<typeof setInterval> | null = null
 
 onUnmounted(() => {
   clearTimer()
-  // #ifdef MP-WEIXIN
-  wx.offUserCaptureScreen()
-  // #endif
 })
 
 const records = ref<ReserveRecord[]>([])
@@ -308,15 +305,6 @@ async function fetchRecords(append = false) {
 }
 
 onLoad(() => {
-  // #ifdef MP-WEIXIN
-  wx.setVisualEffectOnCapture({ visualEffect: 'hidden' })
-  wx.onUserCaptureScreen(() => {
-    uni.showToast({ title: '该页面截图无效，请不要截图', icon: 'none' })
-    if (currentRecord.value) {
-      fetchCode(currentRecord.value)
-    }
-  })
-  // #endif
   fetchRecords()
 })
 
diff --git a/src/packages/user/pages/reserve/success.vue b/src/packages/user/pages/reserve/success.vue
index eb026d9..5b80929 100644
--- a/src/packages/user/pages/reserve/success.vue
+++ b/src/packages/user/pages/reserve/success.vue
@@ -106,21 +106,9 @@ let countdownTimer: ReturnType<typeof setInterval> | null = null
 
 onUnmounted(() => {
   clearTimer()
-  // #ifdef MP-WEIXIN
-  wx.offUserCaptureScreen()
-  // #endif
 })
 
 onLoad(async (query: any) => {
-  // #ifdef MP-WEIXIN
-  wx.setVisualEffectOnCapture({ visualEffect: 'hidden' })
-  wx.onUserCaptureScreen(() => {
-    uni.showToast({ title: '该页面截图无效，请不要截图', icon: 'none' })
-    if (codePopup.value) {
-      fetchCode()
-    }
-  })
-  // #endif
   const appointId = query?.appointId
   if (!appointId) return
   const phone = (uni.getStorageSync('phone') as string) || ''