fix: 核销验券功能修复与首页公告栏改版

- 首页：金刚区「抖音核销」改名「核销验券」；公告栏移至金刚区下方并支持两条同时展示，修复行距与上下间距过近
- 核销页：「抖音」文案统一改为「第三方」；券号区新增第三方平台图标行；修复 `await uni.request` 返回任务句柄（非响应体）导致的「获取凭证失败」，改回调式 rawRequest 封装；无凭证时也弹温馨提示
- 购买页：删除支付取消/失败分支引用 try 作用域外变量 outTradeNo 的失效跳转
- 类型：VoucherItem 补 product_id 可选字段，消除存量类型报错
- 导航栏标题同步改为「第三方核销」

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

package.json

@@ -34,7 +34,8 @@
     "build:quickapp-webview": "uni build -p quickapp-webview",
     "build:quickapp-webview-huawei": "uni build -p quickapp-webview-huawei",
     "build:quickapp-webview-union": "uni build -p quickapp-webview-union",
-    "type-check": "vue-tsc --noEmit"
+    "type-check": "vue-tsc --noEmit",
+    "check:api-prefix": "bash scripts/check-api-prefix.sh"
   },
   "dependencies": {
     "@dcloudio/uni-app": "3.0.0-alpha-5010320260611001",

scripts/check-api-prefix.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# xuchao: 防止页面调用写死 /mp-api 前缀（request.ts 的 API_BASE 已含该前缀，重复会形成双前缀，
+# 依赖 chaos 路由全局剥离才能工作，属错误写法）。命中即失败。
+set -e
+if grep -rn --include='*.vue' --include='*.ts' -e "('/mp-api/" -e '("/mp-api/' src; then
+  echo "❌ 发现页面写死 /mp-api 前缀，请去掉（API_BASE 会自动拼接）"
+  exit 1
+fi
+echo "✅ api 前缀检查通过"

src/api/order.ts

@@ -1,11 +0,0 @@
-import { post } from './request'
-import { BASE_URL } from '../config'
-import type { CreateOrderParams, CreateOrderResult, PrepayParams, PrepayResult } from './types'
-
-export function createOrder(params: CreateOrderParams) {
-  return post<CreateOrderResult>(`${BASE_URL}/open-api/pingXiang/createOrder`, params)
-}
-
-export function prepay(params: PrepayParams) {
-  return post<PrepayResult>(`${BASE_URL}/open-api/pingXiang/prepay`, params)
-}

src/api/types.ts

@@ -185,6 +185,8 @@ export interface OAuth2LoginResult {
 /** 用户年卡列表项（来自 /zhy-api/cardBag/userCardList） */
 export interface UserCardListItem {
   cardNo: string
+  // xuchao: 卡种ID（后端 CardBagBean.cardModelId），人脸预检与卡种过滤均在用
+  cardModelId: number
   cardModelName: string
   validityTime: string
   cardModelPic: string

src/packages/content/pages/faq.vue

@@ -49,7 +49,7 @@ const loading = ref(true)
 
 onMounted(async () => {
   try {
-    const data = await post<BannerItem[]>('/mp-api/mpContent/queryList', { channel: 'pingxiang', type: 'FAQ' })
+    const data = await post<BannerItem[]>('/mpContent/queryList', { channel: 'pingxiang', type: 'FAQ' })
     faqList.value = (data || []).map(n => ({
       id: n.id,
       title: n.title,

src/packages/content/pages/notice-list.vue

@@ -41,7 +41,7 @@ const notices = ref<NoticeItem[]>([])
 
 onMounted(async () => {
   try {
-    const data = await post<BannerItem[]>('/mp-api/mpContent/queryList', { channel: 'pingxiang', type: 'NOTICE' })
+    const data = await post<BannerItem[]>('/mpContent/queryList', { channel: 'pingxiang', type: 'NOTICE' })
     notices.value = (data || []).map(n => ({
       id: n.id,
       title: n.title,

src/packages/content/pages/scenic-detail.vue

@@ -193,7 +193,25 @@ function fixRichHtml(html: string): string {
 
 const introductionHtml = computed(() => fixRichHtml(scenic.value.introduction))
 const bookingNoticeHtml = computed(() => fixRichHtml(scenic.value.bookingNoticeHtml))
-const storeNoticeHtml = computed(() => fixRichHtml(storeNotice.value.content))
+
+/** 富文本标签特征（管理端公告内容为 textarea 纯文本，含标签才视为 HTML） */
+// xuchao: 判断公告正文是否为编辑器产出的 HTML
+const HTML_TAG_RE = /<(?:p|br|div|span|strong|em|i|b|u|h[1-6]|img|ul|ol|li|a|table|tr|td|video|section)[^>]*>/i
+
+// xuchao: 纯文本转 rich-text 可渲染的 HTML：转义特殊字符 + 换行转 <br/>，保留后台录入的段落格式
+function plainTextToHtml(text: string): string {
+  return text
+    .replace(/&(?!(?:#\d+|#x[0-9a-fA-F]+|[a-zA-Z][a-zA-Z0-9]*);)/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/\n/g, '<br/>')
+}
+
+const storeNoticeHtml = computed(() => {
+  const content = storeNotice.value.content
+  if (!content) return ''
+  return HTML_TAG_RE.test(content) ? fixRichHtml(content) : plainTextToHtml(content)
+})
 
 const activeTab = ref<'notice' | 'intro'>('notice')
 const currentSlide = ref(0)
@@ -225,7 +243,7 @@ onLoad((options) => {
 
 async function fetchShopNotice(shopId: string) {
   try {
-    const res = await post<any>('/mp-api/mpShopNotice/queryShopNoticePage', {
+    const res = await post<any>('/mpShopNotice/queryShopNoticePage', {
       shopId,
       pageNo: 1,
       pageSize: 5,
@@ -247,7 +265,7 @@ async function fetchDetail(shopId: string) {
     const phone = uni.getStorageSync('phone') as string
     if (phone) params.phone = phone
 
-    const res = await post<any>('/mp-api/mpScenic/getScenicDetail', params)
+    const res = await post<any>('/mpScenic/getScenicDetail', params)
     if (res) {
       scenic.value = {
         id: res.id || res.scenicId || shopId,
@@ -862,13 +880,14 @@ $icon-crown: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' w
   text-align: center;
 }
 
+/* xuchao: 正文区固定 45vh 高度——微信要求 scroll-view 有确定高度才能竖向滚动；flex-shrink:0 防止被弹窗整体高度压缩 */
 .notice-popup-body {
+  height: 45vh;
+  flex-shrink: 0;
   padding: $spacing-3 $spacing-5 $spacing-3;
   font-size: $font-size-sm;
   color: $uv-tips-color;
   line-height: 1.9;
-  max-height: 45vh;
-  overflow-y: auto;
 }
 
 .notice-popup-footer {

src/packages/content/pages/scenic-list.vue

@@ -294,7 +294,7 @@ async function fetchScenicList(resetPage = true) {
       phone: uni.getStorageSync('phone') || '',
     }
 
-    const res = await post<any>('/mp-api/mpScenic/queryScenicList', params)
+    const res = await post<any>('/mpScenic/queryScenicList', params)
     const list = res?.list || res?.rows || res?.records || res || []
     const totalCount = res?.total || res?.totalCount || 0
     total.value = totalCount
@@ -344,7 +344,7 @@ onLoad((query: any) => {
 })
 
 onMounted(async () => {
-  const filterRes = await post<any>('/mp-api/mpScenic/queryFilterOptions', { channel: 'pingxiang' }).catch(() => null)
+  const filterRes = await post<any>('/mpScenic/queryFilterOptions', { channel: 'pingxiang' }).catch(() => null)
 
   if (filterRes) {
     const levels = filterRes.levels || filterRes.levelList || []

src/packages/content/pages/usage-guide.vue

@@ -17,7 +17,7 @@ const loading = ref(true)
 
 onMounted(async () => {
   try {
-    const data = await post<BannerItem[]>('/mp-api/mpContent/queryList', { channel: 'pingxiang', type: 'GUIDE' })
+    const data = await post<BannerItem[]>('/mpContent/queryList', { channel: 'pingxiang', type: 'GUIDE' })
     if (data && data.length > 0) {
       imageUrl.value = data[0].imageUrl || ''
     }

src/packages/user/api/card.ts

@@ -69,20 +69,20 @@ export function checkFaceFlag(cardNo: string): Promise<boolean> {
 }
 
 /** 上传图片到 OSS */
-export function uploadImage(filePath: string): Promise<string> {
+export function uploadImage(filePath: string, endpoint = '/open-api/oss/upload'): Promise<string> {
   return new Promise((resolve, reject) => {
     uni.uploadFile({
-      url: `${BASE_URL}/open-api/oss/upload`,
+      url: `${BASE_URL}${endpoint}`,
       filePath,
       name: 'file',
       success: (res) => {
         if (res.statusCode === 200) {
           try {
             const data = JSON.parse(res.data as string)
-            if (data.errcode === 0 && data.data?.fileUrl) {
+            if ((data.errcode === 0 || data.code === 200) && data.data?.fileUrl) {
               resolve(data.data.fileUrl)
             } else {
-              reject(new Error(data.errmsg || '上传失败'))
+              reject(new Error(data.errmsg || data.msg || '上传失败'))
             }
           } catch { reject(new Error('解析响应失败')) }
         } else {

src/packages/user/api/douyin.ts

@@ -25,6 +25,8 @@ export interface VoucherItem {
   status: number
   mobile: string
   product_name: string
+  // xuchao: 小泥人真实响应带此字段（前端按 product_id 过滤本渠道券码），mock 数据可不填，故设为可选
+  product_id?: string
   merchant_name: string
   voucherRealnameInfo?: VoucherRealnameInfo[]
 }
@@ -82,7 +84,7 @@ export async function queryVoucherList(params: QueryVoucherListParams): Promise<
     await delay(300)
     return MOCK_VOUCHERS.map((v) => ({ ...v, mobile: params.mobile }))
   }
-  return post<VoucherItem[]>('/mp-api/douyin/voucherList', params)
+  return post<VoucherItem[]>('/douyin/voucherList', params)
 }
 
 /**
@@ -94,5 +96,5 @@ export async function activateAndBind(params: ActivateAndBindParams): Promise<vo
     await delay(800)
     return
   }
-  await post<null>('/mp-api/douyin/activateAndBind', params)
+  await post<null>('/douyin/activateAndBind', params)
 }

src/packages/user/api/pingxiang-order.ts

@@ -0,0 +1,13 @@
+// xuchao: 萍乡超级玩家卡下单/预支付接口（open-api 渠道）。原为主包 api/order.ts，
+// 因仅被本分包页面引用导致主包整包扫描告警，迁入分包；与本地 order.ts（/order/* 旧接口）不是同一组接口，勿混用。
+import { post } from '../../../api/request'
+import { BASE_URL } from '../../../config'
+import type { CreateOrderParams, CreateOrderResult, PrepayParams, PrepayResult } from '../../../api/types'
+
+export function createOrder(params: CreateOrderParams) {
+  return post<CreateOrderResult>(`${BASE_URL}/open-api/pingXiang/createOrder`, params)
+}
+
+export function prepay(params: PrepayParams) {
+  return post<PrepayResult>(`${BASE_URL}/open-api/pingXiang/prepay`, params)
+}

src/packages/user/pages/bind.vue

@@ -115,6 +115,35 @@
       </button>
     </view>
 
+    <!-- 5. 照片拍摄要求提示 -->
+    <view class="photo-tips">
+      <text class="photo-tips__title">照片拍摄要求</text>
+      <view class="photo-tips__item">
+        <view class="photo-tips__dot" />
+        <text class="photo-tips__text">图片仅允许1张人脸，多人脸直接驳回</text>
+      </view>
+      <view class="photo-tips__item">
+        <view class="photo-tips__dot" />
+        <text class="photo-tips__text">图片不能无人脸、侧脸过大、遮挡严重（口罩/帽子遮大半脸）</text>
+      </view>
+      <view class="photo-tips__item">
+        <view class="photo-tips__dot" />
+        <text class="photo-tips__text">不允许全身、远景、远距离人像照片</text>
+      </view>
+      <view class="photo-tips__item">
+        <view class="photo-tips__dot" />
+        <text class="photo-tips__text">不允许脸部极致特写、贴脸拍摄无留白</text>
+      </view>
+      <view class="photo-tips__item">
+        <view class="photo-tips__dot" />
+        <text class="photo-tips__text">图片清晰，无严重模糊、逆光、黑影、反光</text>
+      </view>
+      <view class="photo-tips__item">
+        <view class="photo-tips__dot" />
+        <text class="photo-tips__text">不允许翻拍屏幕、截图、证件复印件照片</text>
+      </view>
+    </view>
+
     <!-- 弹窗：证件类型选择 -->
     <uni-popup ref="idTypePopup" type="bottom" :mask-click="true" mask-background="transparent" @change="(e: any) => showIdTypePicker = e.show">
       <view class="popup-sheet">
@@ -237,11 +266,16 @@ async function handleImage(filePath: string) {
   try {
     const compressedPath = await compressImage(filePath)
     uni.showLoading({ title: '上传中...' })
-    const url = await uploadImage(compressedPath)
+    const url = await uploadImage(compressedPath, '/open-api/oss/uploadWithFaceCheck')
     photoUrl.value = url
     uni.showToast({ title: '上传成功', icon: 'success' })
-  } catch {
+  } catch (e) {
-    uni.showToast({ title: '上传失败', icon: 'none' })
+    uni.showModal({
+      title: '上传失败',
+      content: (e as Error).message || '上传失败',
+      showCancel: false,
+      confirmText: '确定',
+    })
   } finally {
     uploading.value = false
     uni.hideLoading()
@@ -362,8 +396,8 @@ function handleCancel() {
 
 /* ===== Page ===== */
 .page {
-  height: 100vh;
+  min-height: 100vh;
-  overflow: hidden;
+  overflow-y: auto;
   background: $color-card;
   font-family: $font-family-body;
 }
@@ -714,6 +748,52 @@ function handleCancel() {
   color: $uv-tips-color;
 }
 
+/* ===== 5. Photo Tips ===== */
+.photo-tips {
+  margin: 32rpx 24rpx;
+  padding: 28rpx;
+  background: #f7f8fa;
+  border-radius: 16rpx;
+}
+
+.photo-tips__title {
+  display: block;
+  font-family: $font-family-body;
+  font-size: $font-size-sm;
+  font-weight: $font-weight-medium;
+  color: $uv-main-color;
+  margin-bottom: 16rpx;
+}
+
+.photo-tips__item {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 12rpx;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.photo-tips__dot {
+  width: 8rpx;
+  height: 8rpx;
+  border-radius: 50%;
+  background: $uv-primary;
+  flex-shrink: 0;
+  margin-top: 14rpx;
+  margin-right: 12rpx;
+}
+
+.photo-tips__text {
+  flex: 1;
+  font-family: $font-family-body;
+  font-size: $font-size-xs;
+  font-weight: 400;
+  color: $uv-tips-color;
+  line-height: 36rpx;
+}
+
 /* ===== Popup Sheet ===== */
 .popup-sheet {
   background: $color-card;

src/packages/user/pages/buy.vue

@@ -50,7 +50,7 @@ import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
 import { post, getToken } from '../../../api/request'
 import { BASE_URL } from '../../../config'
 import { useUserStore } from '../../../store/user'
-import { createOrder, prepay } from '../../../api/order'
+import { createOrder, prepay } from '../api/pingxiang-order'
 import type { BannerItem } from '../../../api/types'
 
 const userStore = useUserStore()
@@ -85,7 +85,7 @@ const noticeHtml = computed(() => fixRichHtml(noticeContent.value))
 /** 获取购卡须知富文本（type = CARD_PURCHASE_NOTICE） */
 async function fetchPurchaseNotice() {
   try {
-    const res = await post<BannerItem[]>('/mp-api/mpContent/queryList', {
+    const res = await post<BannerItem[]>('/mpContent/queryList', {
       channel: 'pingxiang',
       type: 'CARD_PURCHASE_NOTICE',
     })
@@ -211,10 +211,8 @@ async function confirmBuy() {
       uni.redirectTo({ url: `/packages/user/pages/order/detail?orderId=${outTradeNo}` })
     }, 1500)
   } catch (err: any) {
+    // xuchao: 取消/失败后仅提示，停留在购买页（原"跳订单列表"引用了 try 作用域外的 outTradeNo，实为失效死代码，已删）
     uni.showToast({ title: err?.errMsg?.includes('cancel') ? '已取消支付' : '支付失败，请重试', icon: 'none' })
-    setTimeout(() => {
-      uni.redirectTo({ url: `/packages/user/pages/order/list?outTradeNo=${outTradeNo}` })
-    }, 1500)
   } finally {
     paying.value = false
   }

src/packages/user/pages/card-notice.vue

@@ -23,7 +23,7 @@ const loading = ref(true)
 
 onMounted(async () => {
   try {
-    const list = await post<any[]>('/mp-api/mpContent/queryList', { channel: 'pingxiang', type: 'CARD_NOTICE' })
+    const list = await post<any[]>('/mpContent/queryList', { channel: 'pingxiang', type: 'CARD_NOTICE' })
     content.value = list?.[0]?.content || ''
   } catch {
     showToast('加载失败')

src/packages/user/pages/douyin-verify.vue

@@ -4,16 +4,23 @@
     <image class="hero-bg" src="https://aliyunoss.hn12301.net/pxmall/px_douyin.png" mode="widthFix" />
 
     <scroll-view scroll-y class="body">
-      <!-- 第 1 步：确认抖音下单信息 -->
+      <!-- 第 1 步：确认第三方下单信息 -->
       <view class="section">
         <view class="step-head">
           <text class="step-no">第 1 步：</text>
-          <text class="step-title">确认抖音下单信息</text>
+          <text class="step-title">确认第三方下单信息</text>
         </view>
         <text class="step-desc">
-          请确认在抖音平台认证的号码与微信手机号一致，如号码不一致请在抖音订单详情页面复制券号，并粘贴在券号输入框
+          请确认在第三方平台认证的号码与微信手机号一致，如号码不一致请在第三方订单详情页面复制券号，并粘贴在券号输入框
         </text>
 
+        <!-- xuchao: 支持的第三方出票平台图标（设计稿 50x50、间隔 12px，rpx 按 2 倍换算） -->
+        <view class="platform-logos">
+          <image class="platform-logo" src="https://aliyunoss.hn12301.net/pxmall/px_logo_dy.png" mode="aspectFit" />
+          <image class="platform-logo" src="https://aliyunoss.hn12301.net/pxmall/px_logo_dz.png" mode="aspectFit" />
+          <image class="platform-logo" src="https://aliyunoss.hn12301.net/pxmall/px_logo_mt.png" mode="aspectFit" />
+        </view>
+
         <view class="field">
           <text class="field-label">当前微信手机号：</text>
           <view class="field-box">
@@ -22,7 +29,7 @@
         </view>
 
         <view class="field">
-          <text class="field-label">抖音的订单券号：</text>
+          <text class="field-label">第三方的订单券号：</text>
 
           <!-- 有券号：按 code 分组单选列表 -->
           <template v-if="hasVoucher">
@@ -34,7 +41,7 @@
               @tap="selectVoucher(group)"
             >
               <text class="code-text">
-                抖音订单号{{ index + 1 }}：{{ group.code }}（可激活次数{{ group.count }}次）
+                第三方订单号{{ index + 1 }}：{{ group.code }}（可激活次数{{ group.count }}次）
               </text>
               <view class="radio" :class="{ 'radio--on': selectedCode === group.code }">
                 <view v-if="selectedCode === group.code" class="radio-dot" />
@@ -176,11 +183,11 @@
           </view>
           <view class="no-voucher-reason">
             <text class="no-voucher-num">1.</text>
-            <text>抖音购卡的手机号和当前登录手机号码不一致</text>
+            <text>第三方购卡的手机号和当前登录手机号码不一致</text>
           </view>
           <view class="no-voucher-reason">
             <text class="no-voucher-num">2.</text>
-            <text>抖音购卡的订单已经核销完成了</text>
+            <text>第三方购卡的订单已经核销完成了</text>
           </view>
           <view class="no-voucher-reason">
             <text class="no-voucher-num">3.</text>
@@ -248,6 +255,27 @@ import type { BannerItem } from '../../../api/types'
 
 const userStore = useUserStore()
 
+// xuchao: 回调式 uni.request Promise 包装。当前 uni-app alpha 运行时下 `await uni.request()`
+// 返回的是 RequestTask（仅含 uniqueId 字段）而非 HTTP 响应，res.data 恒为 undefined，
+// 导致「获取凭证失败」；本页所有第三方直连请求统一改走此封装（对齐 api/request.ts 模式）。
+function rawRequest(options: {
+  url: string
+  method?: 'GET' | 'POST'
+  data?: object
+  header?: Record<string, string>
+}): Promise<UniApp.RequestSuccessCallbackResult> {
+  return new Promise((resolve, reject) => {
+    uni.request({
+      url: options.url,
+      method: options.method || 'GET',
+      data: options.data as AnyObject,
+      header: options.header,
+      success: (res: UniApp.RequestSuccessCallbackResult) => resolve(res),
+      fail: (err: UniApp.GeneralCallbackResult) => reject(new Error(err.errMsg || 'request:fail')),
+    })
+  })
+}
+
 const phone = ref((uni.getStorageSync('phone') as string) || '')
 const maskedPhone = computed(() =>
   phone.value ? phone.value.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2') : '-'
@@ -310,7 +338,7 @@ const noticeHtml = computed(() => fixRichHtml(noticeContent.value))
 /** 获取购卡须知富文本（type = CARD_PURCHASE_NOTICE） */
 async function fetchPurchaseNotice() {
   try {
-    const res = await post<BannerItem[]>('/mp-api/mpContent/queryList', {
+    const res = await post<BannerItem[]>('/mpContent/queryList', {
       channel: 'pingxiang',
       type: 'CARD_PURCHASE_NOTICE',
     })
@@ -364,7 +392,7 @@ onShow(async () => {
 async function fetchOAuthToken() {
   try {
     console.log('[douyin] fetching OAuth token...')
-    const res = await uni.request({
+    const res = await rawRequest({
       url: 'https://www.xiaoniren.cn/openapi/oauth2-token/authorize?client_id=uwfdRQD0CjHrz0oY&client_key=186c07637ed40ef9ef0a2289b188ac',
       method: 'GET',
     })
@@ -389,10 +417,12 @@ async function fetchVouchers() {
   if (!phone.value || !accessToken.value) {
     vouchers.value = []
     vouchersLoaded.value = true
+    // xuchao: 凭证获取失败时无券可展示，同样弹温馨提示引导手动输入券码（此前静默无提示）
+    showNoVoucher.value = true
     return
   }
   try {
-    const res = await uni.request({
+    const res = await rawRequest({
       url: `https://www.xiaoniren.cn/openapi/ticket/voucher-list?status=1&mobile=${phone.value}&product_id=59221&page=1&per-page=100`,
       method: 'GET',
       header: {
@@ -425,7 +455,7 @@ async function verifyInputCode() {
   }
   uni.showLoading({ title: '验证中...', mask: true })
   try {
-    const res = await uni.request({
+    const res = await rawRequest({
       url: `https://www.xiaoniren.cn/openapi/ticket/voucher-list?status=1&code=${encodeURIComponent(code)}&product_id=59221&page=1&per-page=100`,
       method: 'GET',
       header: {
@@ -496,11 +526,11 @@ async function doActivate() {
   uni.showLoading({ title: '核销中...', mask: true })
   try {
     // 第一步：调后端发卡绑定
-    const sendRes = await uni.request({
+    const sendRes = await rawRequest({
       url: `${BASE_URL}/open-api/card/sendAndBind`,
       method: 'POST',
       data: {
-        orderNo: selectedVoucher.value?.id || '',
+        orderNo: `${selectedVoucher.value?.code || ''}-${selectedVoucher.value?.id || ''}`,
         typeId: '820093438328133',
         userName: form.userName.trim(),
         mobile: phone.value,
@@ -521,7 +551,7 @@ async function doActivate() {
     }
 
     // 第二步：验证券码
-    const validateRes = await uni.request({
+    const validateRes = await rawRequest({
       url: 'https://www.xiaoniren.cn/openapi/ticket/validate',
       method: 'POST',
       header: {
@@ -578,10 +608,15 @@ async function handleImage(filePath: string) {
   try {
     const compressed = await compressImage(filePath)
     uni.showLoading({ title: '上传中...' })
-    faceImg.value = await uploadImage(compressed)
+    faceImg.value = await uploadImage(compressed, '/open-api/oss/uploadWithFaceCheck')
     uni.showToast({ title: '上传成功', icon: 'success' })
-  } catch {
+  } catch (e) {
-    uni.showToast({ title: '上传失败', icon: 'none' })
+    uni.showModal({
+      title: '上传失败',
+      content: (e as Error).message || '上传失败',
+      showCancel: false,
+      confirmText: '确定',
+    })
   } finally {
     uploading.value = false
     uni.hideLoading()
@@ -715,6 +750,18 @@ function closeNoVoucher() {
   color: #ff383c;
   line-height: 48rpx;
 }
+/* xuchao: 券号下方第三方平台图标行（20x20、间隔 12px 的 2 倍 rpx） */
+.platform-logos {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 24rpx;
+  margin-top: 24rpx;
+}
+.platform-logo {
+  width: 100rpx;
+  height: 100rpx;
+}
 .field-box {
   display: flex;
   align-items: center;

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

src/packages/user/pages/reserve/list.vue

@@ -58,7 +58,7 @@
           </view>
           <!-- 预约入园日期 -->
           <view class="record-info">
-            <text class="record-date">预约入园日期：{{ r.date }}</text>
+            <text class="record-date">预约入园日期：<text class="record-date--value">{{ formatDateOnly(r.date) }}</text></text>
           </view>
           <!-- 操作 -->
           <view class="record-actions">
@@ -124,7 +124,7 @@
     </uni-popup>
 
     <!-- 详情弹窗 -->
-    <uni-popup ref="detailPopup" type="bottom" :mask-click="true">
+    <uni-popup ref="detailPopup" type="center" :mask-click="true">
       <view class="detail-sheet">
         <view class="sheet-header">
           <text class="sheet-title">使用详情</text>
@@ -137,17 +137,9 @@
             <text class="sheet-label">预约景区</text>
             <text class="sheet-value">{{ detailRecord?.scenicName }}</text>
           </view>
-          <view class="sheet-row">
-            <text class="sheet-label">卡种</text>
-            <text class="sheet-value">{{ detailRecord?.cardType }}</text>
-          </view>
-          <view class="sheet-row">
-            <text class="sheet-label">卡号</text>
-            <text class="sheet-value">{{ detailRecord?.cardNo }}</text>
-          </view>
           <view class="sheet-row">
             <text class="sheet-label">预约入园日期</text>
-            <text class="sheet-value">{{ detailRecord?.date }}</text>
+            <text class="sheet-value sheet-value--date">{{ formatDateOnly(detailRecord?.date) }}</text>
           </view>
           <view v-if="detailRecord?.session" class="sheet-row">
             <text class="sheet-label">预约场次</text>
@@ -157,10 +149,6 @@
             <text class="sheet-label">预约人</text>
             <text class="sheet-value">{{ detailRecord?.userName }}</text>
           </view>
-          <view class="sheet-row">
-            <text class="sheet-label">证件号</text>
-            <text class="sheet-value">{{ detailRecord?.maskedId }}</text>
-          </view>
           <view class="sheet-row">
             <text class="sheet-label">预约状态</text>
             <text class="sheet-value">{{ detailStatusLabel(detailRecord?.status || '') }}</text>
@@ -177,6 +165,11 @@
             <text class="sheet-label">取消时间</text>
             <text class="sheet-value">{{ detailRecord.cancelTime }}</text>
           </view>
+          <!-- 人脸图片 -->
+          <view v-if="detailRecord?.photo" class="sheet-photo">
+            <text class="sheet-label">人脸图片</text>
+            <image class="sheet-photo-avatar" :src="detailRecord.photo" mode="aspectFill" @tap="previewPhoto(detailRecord.photo)" />
+          </view>
           <!-- 核销人脸照片 -->
           <view v-if="detailRecord?.verifyPhoto" class="sheet-photo">
             <text class="sheet-label">核销照片</text>
@@ -213,6 +206,7 @@ interface ReserveRecord {
   cancelTime?: string
   verifyTime?: string
   verifyPhoto?: string
+  photo?: string
   cardInstruction?: string
   cardModelId?: string
   canCancel?: boolean
@@ -244,9 +238,6 @@ let countdownTimer: ReturnType<typeof setInterval> | null = null
 
 onUnmounted(() => {
   clearTimer()
-  // #ifdef MP-WEIXIN
-  wx.offUserCaptureScreen()
-  // #endif
 })
 
 const records = ref<ReserveRecord[]>([])
@@ -288,6 +279,7 @@ async function fetchRecords(append = false) {
       cancelTime: item.cancelTime || '',
       verifyTime: item.verifyTime || '',
       verifyPhoto: item.verifyPhoto || '',
+      photo: item.photo || '',
       cardInstruction: item.cardInstruction || '',
       cardModelId: item.cardModelId || item.thirdId || '',
       canCancel: !!item.canCancel,
@@ -308,15 +300,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()
 })
 
@@ -332,6 +315,12 @@ function formatReserveDate(date?: string): string {
   return `${m[1]} 年 ${Number(m[2])} 月 ${Number(m[3])} 日`
 }
 
+/** 日期去除时分秒（如 2026-08-05 10:00:00 → 2026-08-05） */
+function formatDateOnly(date?: string): string {
+  if (!date) return ''
+  return date.split(' ')[0]
+}
+
 function showCancelModal(r: ReserveRecord) {
   cancelRecord.value = r
   cancelPopup.value?.open()
@@ -449,6 +438,7 @@ async function viewDetail(r: ReserveRecord) {
         cancelTime: res.cancelTime || r.cancelTime,
         verifyTime: res.verifyTime || r.verifyTime,
         verifyPhoto: res.verifyPhoto || r.verifyPhoto,
+        photo: res.photo || r.photo,
         cardInstruction: res.cardInstruction || r.cardInstruction || '',
         cardModelId: res.cardModelId || r.cardModelId || '',
       }
@@ -622,6 +612,11 @@ function previewPhoto(url: string) {
   color: $uv-tips-color;
 }
 
+.record-date--value {
+  color: $uv-error;
+  font-weight: $font-weight-medium;
+}
+
 .record-actions {
   display: flex;
   justify-content: flex-end;
@@ -743,7 +738,7 @@ function previewPhoto(url: string) {
 
 /* ===== Detail Sheet ===== */
 .detail-sheet {
-  background: $color-card; border-radius: $radius-lg $radius-lg 0 0; max-height: 75vh;
+  width: 640rpx; background: $color-card; border-radius: $radius-lg; max-height: 75vh;
   display: flex; flex-direction: column;
 }
 
@@ -778,6 +773,7 @@ function previewPhoto(url: string) {
 
 .sheet-label { font-family: $font-family-body; font-size: $font-size-sm; color: $uv-main-color; }
 .sheet-value { font-family: $font-family-body; font-size: $font-size-sm; color: $uv-content-color; text-align: right; }
+.sheet-value--date { color: $uv-error; font-weight: $font-weight-medium; }
 
 .sheet-photo {
   display: flex;
@@ -788,9 +784,9 @@ function previewPhoto(url: string) {
 }
 
 .sheet-photo-avatar {
-  width: 100rpx;
+  width: 200rpx;
-  height: 100rpx;
+  height: 200rpx;
-  border-radius: 50%;
+  border-radius: 8rpx;
 }
 
 .sheet-tip {

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) || ''

src/pages.json

@@ -141,7 +141,7 @@
         {
           "path": "pages/douyin-verify",
           "style": {
-            "navigationBarTitleText": "抖音核销",
+            "navigationBarTitleText": "第三方核销",
             "backgroundColor": "#FFFFFF",
             "backgroundColorTop": "#FFFFFF",
             "backgroundColorBottom": "#FFFFFF"

src/pages/index/index.vue

@@ -9,37 +9,8 @@
       </swiper>
     </view>
     <scroll-view scroll-y class="main-scroll">
-      <!-- 公告栏 -->
-      <view v-if="announcements.length" class="notice animate-fade-in-up stagger-1">
-        <view class="notice-tag">
-          <view class="notice-pip animate-pulse" :class="`type-${currentNoticeType}`" />
-          <text class="notice-label">公告</text>
-        </view>
-        <swiper
-          class="notice-swiper"
-          vertical
-          :autoplay="swiperAutoplay"
-          circular
-          :interval="3000"
-          :duration="500"
-          @change="onNoticeChange"
-          @touchstart="onNoticeTouchStart"
-          @touchend="onNoticeTouchEnd"
-        >
-          <swiper-item v-for="item in displayNotices" :key="item.id">
-            <view class="notice-item" @click="openNotice(item)">
-              <text class="notice-text">{{ item.title }}</text>
-            </view>
-          </swiper-item>
-        </swiper>
-        <view class="notice-more" @click="goMoreNotice">
-          <text class="notice-more-text">更多</text>
-          <view class="chevron" />
-        </view>
-      </view>
-
       <!-- 金刚区 -->
-      <view class="quick-grid animate-fade-in-up stagger-2">
+      <view class="quick-grid animate-fade-in-up stagger-1">
         <view
           v-for="item in quickActions"
           :key="item.label"
@@ -51,6 +22,28 @@
         </view>
       </view>
 
+      <!-- 公告栏：位于金刚区下方，同时展示两条公告 -->
+      <view v-if="announcements.length" class="notice animate-fade-in-up stagger-2">
+        <view class="notice-tag">
+          <view class="notice-pip animate-pulse" />
+          <text class="notice-label">公告</text>
+        </view>
+        <view class="notice-list">
+          <view
+            v-for="item in displayNotices"
+            :key="item.id"
+            class="notice-item"
+            @click="openNotice(item)"
+          >
+            <text class="notice-text">{{ item.title }}</text>
+          </view>
+        </view>
+        <view class="notice-more" @click="goMoreNotice">
+          <text class="notice-more-text">更多</text>
+          <view class="chevron" />
+        </view>
+      </view>
+
       <!-- 旅游卡 — 大字报风格 -->
       <view class="promo-wrap animate-fade-in-up stagger-2">
         <view class="promo" @click="goCardDetail()">
@@ -125,12 +118,34 @@
       </view>
     </scroll-view>
 
+    <!-- 首页弹窗广告：每次冷启动弹一次，取「首页弹窗」类型排序最前一条 -->
+    <view
+      v-if="homePopupVisible"
+      class="popup-overlay"
+      :class="{ visible: homePopupAnim }"
+      @click="closeHomePopup"
+    >
+      <image
+        class="popup-img"
+        :src="homePopupData?.imageUrl || ''"
+        mode="widthFix"
+        @click.stop="onHomePopupClick"
+        @error="onHomePopupImgError"
+      />
+      <view class="popup-close" @click.stop="closeHomePopup">
+        <view class="close-x">
+          <view class="close-line line-a" />
+          <view class="close-line line-b" />
+        </view>
+      </view>
+    </view>
+
     </view>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted } from 'vue'
+import { ref, computed, onMounted, nextTick } from 'vue'
-import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
+import { onShow, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
 import { post } from '../../api/request'
 import { BASE_URL } from '../../config'
 import type { BannerItem } from '../../api/types'
@@ -182,19 +197,33 @@ async function fetchCardPrice() {
   }
 }
 
-onMounted(async () => {
+onMounted(() => {
   fetchCardPrice()
+  fetchSpots()
+  fetchBannersAndNotices()
+})
+
+/** 获取 banner 与公告（与景区加载互相独立） */
+async function fetchBannersAndNotices() {
   try {
-    const [bannerData, noticeData, spotsData] = await Promise.all([
+    const [bannerData, noticeData] = await Promise.all([
-      post<BannerItem[]>('/mp-api/mpContent/queryList', { channel: 'pingxiang', type: 'BANNER' }),
+      post<BannerItem[]>('/mpContent/queryList', { channel: 'pingxiang', type: 'BANNER' }),
-      post<BannerItem[]>('/mp-api/mpContent/queryList', { channel: 'pingxiang', type: 'NOTICE' }),
+      post<BannerItem[]>('/mpContent/queryList', { channel: 'pingxiang', type: 'NOTICE' }),
-      post<any>('/mp-api/mpScenic/queryScenicList', { channel: 'pingxiang', pageNo: 1, pageSize: 8, phone: uni.getStorageSync('phone') || '' }),
     ])
     banners.value = bannerData || []
     announcements.value = (noticeData || []).map(n => ({
       ...n,
       typeLabel: '公告',
     }))
+  } catch {
+    // 静默失败
+  }
+}
+
+/** 获取热门景点（独立加载，不阻塞 banner/公告渲染） */
+async function fetchSpots() {
+  try {
+    const spotsData = await post<any>('/mpScenic/queryScenicList', { channel: 'pingxiang', pageNo: 1, pageSize: 8, phone: uni.getStorageSync('phone') || '' })
     const list = spotsData?.list || spotsData || []
     hotSpots.value = (Array.isArray(list) ? list : []).slice(0, 8).map((s: any) => ({
       id: s.id || s.scenicId,
@@ -208,7 +237,72 @@ onMounted(async () => {
   } catch {
     // 静默失败
   }
+}
+
+/* ====== 首页弹窗广告（HOME_POPUP） ====== */
+// xuchao: 首页为 tabBar 页，实例与进程同生命周期，实例级标志即「每次冷启动弹一次」
+let homePopupHandled = false
+let homePopupFetching = false
+const homePopupData = ref<BannerItem | null>(null)
+const homePopupVisible = ref(false)
+const homePopupAnim = ref(false)
+
+onShow(() => { checkHomePopup() })
+
+/** 首页每次显示时检查；本次启动已弹过/请求中则跳过；接口失败不置标志，下次进首页重试 */
+async function checkHomePopup() {
+  if (homePopupHandled || homePopupFetching) return
+  homePopupFetching = true
+  try {
+    const list = await post<BannerItem[]>('/mpContent/queryList', { channel: 'pingxiang', type: 'HOME_POPUP' })
+    homePopupHandled = true
+    const item = (list || []).find(c => c.imageUrl)
+    if (item) {
+      homePopupData.value = item
+      homePopupVisible.value = true
+      nextTick(() => { homePopupAnim.value = true })
+    }
+  } catch {
+    // 静默失败，下次进首页再试
+  } finally {
+    homePopupFetching = false
+  }
+}
+
+/** 点击广告图：先关弹窗，再跳配置的内部页面 */
+function onHomePopupClick() {
+  const url = homePopupData.value?.linkUrl
+  homePopupAnim.value = false
+  homePopupVisible.value = false
+  if (url) navigateInnerPage(url)
+}
+
+/** 关闭弹窗（离场动画结束后移除节点） */
+function closeHomePopup() {
+  homePopupAnim.value = false
+  setTimeout(() => { homePopupVisible.value = false }, 280)
+}
+
+/** 图片加载失败直接移除弹窗 */
+function onHomePopupImgError() {
+  homePopupVisible.value = false
+}
+
+// xuchao: tabBar 页 navigateTo 会失败，必须走 switchTab
+const TAB_PAGE_PATHS = ['/pages/index/index', '/pages/qrcode/index', '/pages/profile/index']
+
+/** xuchao: 小程序内部页面智能跳转（tabBar 走 switchTab，其余 navigateTo，失败兜底提示） */
+function navigateInnerPage(url: string) {
+  const path = url.startsWith('/') ? url : `/${url}`
+  if (TAB_PAGE_PATHS.includes(path.split('?')[0])) {
+    uni.switchTab({ url: path })
+    return
+  }
+  uni.navigateTo({
+    url: path,
+    fail: () => uni.showToast({ title: '页面暂未开放', icon: 'none' }),
   })
+}
 
 onShareAppMessage(() => ({
   title: '爱上萍乡旅游年卡',
@@ -235,7 +329,7 @@ function onBannerClick(banner: BannerItem) {
 
 /** 金刚区操作项 */
 const quickActions = [
-  { label: '抖音核销', icon: 'https://aliyunoss.hn12301.net/pxmall/douyin.png' },
+  { label: '核销验券', icon: 'https://aliyunoss.hn12301.net/pxmall/douyin.png' },
   { label: '我要绑卡', icon: 'https://aliyunoss.hn12301.net/pxmall/card.png' },
   { label: '我要预约', icon: 'https://aliyunoss.hn12301.net/pxmall/reserve.png' },
   { label: '我要入园', icon: 'https://aliyunoss.hn12301.net/pxmall/check.png' },
@@ -264,25 +358,13 @@ function onQuickAction(item: { label: string }) {
     uni.navigateTo({ url: '/packages/content/pages/faq' })
     return
   }
-  if (item.label === '抖音核销') {
+  if (item.label === '核销验券') {
     uni.navigateTo({ url: '/packages/user/pages/douyin-verify' })
     return
   }
   uni.showToast({ title: `${item.label}功能开发中`, icon: 'none' })
 }
 
-/** 公告轮播状态 */
-const swiperAutoplay = ref(true)
-const currentNoticeIndex = ref(0)
-const currentNoticeType = computed(() => announcements.value[currentNoticeIndex.value]?.type || 'scenic')
-
-/** @param e - swiper change 事件，`{ detail: { current } }` */
-function onNoticeChange(e: { detail: { current: number } }) { currentNoticeIndex.value = e.detail.current }
-/** 触摸公告轮播时暂停自动播放 */
-function onNoticeTouchStart() { swiperAutoplay.value = false }
-/** 触摸结束后恢复自动播放 */
-function onNoticeTouchEnd() { swiperAutoplay.value = true }
-
 /** 打开公告详情页 */
 function openNotice(item: BannerItem & { typeLabel: string }) {
   uni.setStorageSync('notice_detail', {
@@ -399,7 +481,7 @@ function goMore() {
   align-items: center;
   background: $color-card;
   padding: $spacing-2 $spacing-3;
-  margin: $spacing-2 $spacing-3 0;
+  margin: 0 $spacing-3 $spacing-3;
   border-radius: 24rpx;
   box-shadow: $shadow-sm;
 }
@@ -419,21 +501,25 @@ function goMore() {
   font-weight: $font-weight-medium;
 }
 
-.notice-swiper {
+/* xuchao: 公告两条同时展示，纵向排列替换原单条轮播 */
+.notice-list {
   flex: 1;
-  height: 40rpx;
+  display: flex;
+  flex-direction: column;
+  gap: $spacing-1;
+  overflow: hidden;
 }
 
 .notice-item {
   display: flex;
   align-items: center;
-  height: 40rpx;
+  height: 56rpx;
 }
 
 .notice-text {
   font-size: $font-size-sm;
   color: $color-muted-foreground;
-  line-height: 40rpx;
+  line-height: 56rpx;
   display: -webkit-box;
   -webkit-line-clamp: 1;
   -webkit-box-orient: vertical;
@@ -809,4 +895,90 @@ function goMore() {
 .main-scroll {
   flex: 1;
 }
+
+/* ============================================
+   首页弹窗广告
+   ============================================ */
+.popup-overlay {
+  position: fixed;
+  inset: 0;
+  z-index: $z-modal;
+  background: rgba(0, 0, 0, 0.45);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  opacity: 0;
+  transition: opacity 280ms cubic-bezier(0.16, 1, 0.3, 1);
+
+  &.visible {
+    opacity: 1;
+
+    .popup-img {
+      transform: scale(1);
+      opacity: 1;
+    }
+
+    .popup-close {
+      opacity: 1;
+      transform: scale(1);
+    }
+  }
+}
+
+/* 广告图：宽 600rpx 固定，高按原图比例（widthFix）自适应 */
+.popup-img {
+  width: 600rpx;
+  border-radius: $radius-2xl;
+  overflow: hidden;
+  transform: scale(0.88);
+  opacity: 0;
+  transition: transform 320ms cubic-bezier(0.16, 1, 0.3, 1),
+              opacity 260ms cubic-bezier(0.16, 1, 0.3, 1);
+}
+
+.popup-close {
+  width: 72rpx;
+  height: 72rpx;
+  border-radius: $radius-full;
+  border: 2rpx solid rgba(255, 255, 255, 0.35);
+  background: transparent;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: $spacing-4;
+  flex-shrink: 0;
+  opacity: 0;
+  transform: scale(0.8);
+  transition: opacity 320ms cubic-bezier(0.16, 1, 0.3, 1) 120ms,
+              transform 320ms cubic-bezier(0.16, 1, 0.3, 1) 120ms;
+
+  &:active {
+    background: rgba(255, 255, 255, 0.1);
+  }
+}
+
+.close-x {
+  width: 24rpx;
+  height: 24rpx;
+  position: relative;
+}
+
+.close-line {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 28rpx;
+  height: 2rpx;
+  background: #ffffff;
+  border-radius: 2rpx;
+
+  &.line-a {
+    transform: translate(-50%, -50%) rotate(45deg);
+  }
+
+  &.line-b {
+    transform: translate(-50%, -50%) rotate(-45deg);
+  }
+}
 </style>

src/pages/login/agreement.vue

@@ -23,7 +23,7 @@ const loading = ref(true)
 
 onMounted(async () => {
   try {
-    const list = await post<any[]>('/mp-api/mpContent/queryList', { channel: 'pingxiang', type: 'TERMS' })
+    const list = await post<any[]>('/mpContent/queryList', { channel: 'pingxiang', type: 'TERMS' })
     content.value = list?.[0]?.content || ''
   } catch {
     showToast('加载失败')

src/pages/login/privacy.vue

@@ -23,7 +23,7 @@ const loading = ref(true)
 
 onMounted(async () => {
   try {
-    const list = await post<any[]>('/mp-api/mpContent/queryList', { channel: 'pingxiang', type: 'PRIVACY' })
+    const list = await post<any[]>('/mpContent/queryList', { channel: 'pingxiang', type: 'PRIVACY' })
     content.value = list?.[0]?.content || ''
   } catch {
     showToast('加载失败')

src/pages/qrcode/index.vue

@@ -106,13 +106,13 @@
           <view class="detail-row">
             <text class="detail-label">卡号：</text>
             <view class="detail-value-wrap">
-              <text class="detail-value">{{ currentCard.cardNo }}</text>
+              <text class="detail-value">{{ currentCard?.cardNo }}</text>
               <text class="copy-btn" @click="copyCardNo">复制</text>
             </view>
           </view>
           <view class="detail-row">
             <text class="detail-label">有效期至：</text>
-            <text class="detail-value">{{ formatDateOnly(currentCard.validityTime) }}</text>
+            <text class="detail-value">{{ formatDateOnly(currentCard?.validityTime) }}</text>
           </view>
           <view class="detail-row">
             <text class="detail-label">{{ userInfoData?.idType || '证件' }}：</text>
@@ -124,30 +124,59 @@
       <!-- 入园提示（持卡人信息下方） -->
       <view class="qrcode-section" v-if="!showFaceModal && !isLeaving">
         <text class="qrcode-title">入园提示</text>
-        <view>为确保信息安全，现入园核销只能使用人脸核销。</view>
+        <view v-if="!entryNotice" class="qrcode-fallback">为确保信息安全，现入园核销只能使用人脸核销。</view>
+        <view v-else class="qrcode-content">
+          <rich-text :nodes="entryNotice" />
+        </view>
       </view>
       <!-- 底部占位（滑到底时与tabBar的间隔） -->
       <view style="height: 48rpx;"/>
     </scroll-view>
 
     <!-- 人脸绑定提醒弹窗 -->
-    <ConfirmModal
+    <uni-popup
-      v-model="showFaceModal"
+      ref="faceModalPopup"
-      :title="faceModalTitle"
+      type="center"
-      :content="faceModalContent"
+      :mask-click="false"
-      confirmText="前往人脸绑定"
+      @change="(e: any) => showFaceModal = e.show"
-      @confirm="onFaceModalConfirm"
+    >
-    />
+      <view class="face-modal">
+        <view class="face-modal__title">人脸核销升级通知</view>
+
+        <view class="face-modal__row face-modal__row--spec">
+          <image class="face-modal__icon" src="https://aliyunoss.hn12301.net/sd/ticket_icon1.png" mode="aspectFit" />
+          <view class="face-modal__col">
+            <text class="face-modal__sub-title">拍照规范</text>
+            <view class="face-modal__desc">仅可现场真人实拍正面头像，禁止艺术写真、美颜修图、远景全身、特写大头照;人脸要求完整。</view>
+          </view>
+        </view>
+
+        <view class="face-modal__row">
+          <image class="face-modal__icon" src="https://aliyunoss.hn12301.net/sd/ticket_icon3.png" mode="aspectFit" />
+          <view class="face-modal__col">
+            <text class="face-modal__sub-title">隐私说明</text>
+            <view class="face-modal__desc">采集人脸仅用于本人入园身份核验，信息加密严格保密，不会挪作其他用途。</view>
+          </view>
+        </view>
+
+        <view class="face-modal__tip">
+          <image class="face-modal__tip-icon" src="https://aliyunoss.hn12301.net/sd/ticket_icon2.png" mode="aspectFit" />
+          <view class="face-modal__tip-text">完成人脸重新绑定后，才可正常使用旅游卡</br>全部入园权益功能</view>
+        </view>
+
+        <view class="face-modal__btn" @click="onFaceModalConfirm">立即重新绑定</view>
+        <view class="face-modal__hint">请使用本人实拍照片</view>
+      </view>
+    </uni-popup>
   </view>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onUnmounted } from 'vue'
+import { ref, computed, watch, onUnmounted } from 'vue'
 import { onShow, onHide } from '@dcloudio/uni-app'
 import { useUserStore } from '../../store/user'
 import { getUserCardList, getQrAndUserInfo } from '../../api/card'
-import type { UserCardListItem, QrAndUserInfoResult } from '../../api/types'
+import type { UserCardListItem, QrAndUserInfoResult, BannerItem } from '../../api/types'
-import ConfirmModal from '../../components/confirm-modal.vue'
 import { post } from '../../api/request'
 
 const userStore = useUserStore()
@@ -158,9 +187,14 @@ const loaded = ref(false)
 const userCards = ref<UserCardListItem[]>([])
 const userInfoData = ref<QrAndUserInfoResult | null>(null)
 const showFaceModal = ref(false)
-const faceModalTitle = ref('系统安全升级提醒')
+const faceModalPopup = ref<any>(null)
-const faceModalContent = ref('为保障您的旅游卡信息安全、规范入园使用，平台已启动人脸核验升级。\n根据规则要求，使用旅游卡前需完成人脸绑定，核验仅用于身份核实，人脸信息严格保密，不会挪作他用。\n请立即完成人脸绑定，方可继续使用全部功能。')
+watch(showFaceModal, (v) => {
+  if (v) faceModalPopup.value?.open()
+  else faceModalPopup.value?.close()
+})
 const isLeaving = ref(false)
+const entryNotice = ref('')
+const entryNoticeLoaded = ref(false)
 
 const hasCard = computed(() => userCards.value.length > 0)
 const currentCardIndex = ref(0)
@@ -170,22 +204,17 @@ let timer: ReturnType<typeof setInterval> | null = null
 
 /** 获取用户年卡列表 */
 async function fetchCards() {
-  const mobile = uni.getStorageSync('phone') as string
+  const mobile = (uni.getStorageSync('phone') as string) || userStore.userInfo?.phone || ''
-  if (!mobile) {
-    loaded.value = true
-    loading.value = false
-    return
-  }
   loading.value = true
+  fetchEntryNotice()
   try {
     const list = (await getUserCardList({ mobile, saleChannel: 'xgh' })) || []
     const allowedIds = ['820093340659013', '820093438328133']
     userCards.value = list.filter((c: any) => allowedIds.includes(String(c.cardModelId)))
+    currentCardIndex.value = 0
 
     const firstCard = userCards.value[0]
     if (firstCard?.needFaceImgFlag) {
-      faceModalTitle.value = '系统安全升级提醒'
-      faceModalContent.value = '为保障您的旅游卡信息安全、规范入园使用，平台已启动人脸核验升级。\n根据规则要求，使用旅游卡前需完成人脸绑定，核验仅用于身份核实，人脸信息严格保密，不会挪作他用。\n请立即完成人脸绑定，方可继续使用全部功能。'
       showFaceModal.value = true
     }
 
@@ -200,21 +229,32 @@ async function fetchCards() {
   }
 }
 
+/** 获取入园提示内容（ENTRY_NOTICE 公告） */
+async function fetchEntryNotice() {
+  if (entryNoticeLoaded.value) return
+  try {
+    const list = await post<BannerItem[]>('/mpContent/queryList', { channel: 'pingxiang', type: 'ENTRY_NOTICE' })
+    entryNotice.value = list?.[0]?.content || ''
+  } catch {
+    entryNotice.value = ''
+  } finally {
+    entryNoticeLoaded.value = true
+  }
+}
+
 /** 刷新当前卡的人脸绑定状态（从接口获取最新数据） */
 async function refreshNeedFace() {
-  const mobile = uni.getStorageSync('phone') as string
+  const mobile = (uni.getStorageSync('phone') as string) || userStore.userInfo?.phone || ''
-  if (!mobile) return
   try {
     const list = (await getUserCardList({ mobile, saleChannel: 'xgh' })) || []
     const allowedIds = ['820093340659013', '820093438328133']
     userCards.value = list.filter((c: any) => allowedIds.includes(String(c.cardModelId)))
+    currentCardIndex.value = 0
 
     const current = userCards.value[currentCardIndex.value]
     if (current) {
       fetchUserInfo(current)
       if (current.needFaceImgFlag) {
-        faceModalTitle.value = '系统安全升级提醒'
-        faceModalContent.value = '为保障您的旅游卡信息安全、规范入园使用，平台已启动人脸核验升级。\n根据规则要求，使用旅游卡前需完成人脸绑定，核验仅用于身份核实，人脸信息严格保密，不会挪作他用。\n请立即完成人脸绑定，方可继续使用全部功能。'
         showFaceModal.value = true
       }
     }
@@ -248,8 +288,6 @@ function onCardChange(e: any) {
   if (card) {
     fetchUserInfo(card)
     if (card.needFaceImgFlag) {
-      faceModalTitle.value = '系统安全升级提醒'
-      faceModalContent.value = '为保障您的旅游卡信息安全、规范入园使用，平台已启动人脸核验升级。\n根据规则要求，使用旅游卡前需完成人脸绑定，核验仅用于身份核实，人脸信息严格保密，不会挪作他用。\n请立即完成人脸绑定，方可继续使用全部功能。'
       showFaceModal.value = true
     }
   }
@@ -293,8 +331,10 @@ function goBuyCard() {
 }
 
 function copyCardNo() {
+  const card = currentCard.value
+  if (!card) return
   uni.setClipboardData({
-    data: currentCard.value.cardNo,
+    data: card.cardNo,
     success: () => { uni.showToast({ title: '已复制', icon: 'success' }) },
   })
 }
@@ -346,11 +386,9 @@ function onFeatureClick(item: { label: string }) {
       uni.showToast({ title: '请先选择一张旅游卡', icon: 'none' })
       return
     }
-    post<any>('/mp-api/mpCard/checkFaceBind', { cardModelId: card.cardModelId, cardNumber: card.cardNo })
+    post<any>('/mpCard/checkFaceBind', { cardModelId: card.cardModelId, cardNumber: card.cardNo })
       .then((res) => {
         if (res?.needBindFace) {
-          faceModalTitle.value = '系统安全升级提醒'
-          faceModalContent.value = '为保障您的旅游卡信息安全、规范入园使用，平台已启动人脸核验升级。\n根据规则要求，使用旅游卡前需完成人脸绑定，核验仅用于身份核实，人脸信息严格保密，不会挪作他用。\n请立即完成人脸绑定，方可继续使用全部功能。'
           showFaceModal.value = true
         } else {
           const url = card.thirdId
@@ -400,6 +438,89 @@ onUnmounted(() => { if (timer) clearInterval(timer) })
 .page { min-height: 100vh; background: $color-background; font-family: $font-family-body; }
 .scroll-content {  }
 
+/* === 人脸绑定提醒弹窗 === */
+.face-modal {
+  width: 600rpx;
+  padding: 24rpx;
+  position: relative;
+  box-sizing: border-box;
+  background: #ffffff;
+  border-radius: 24rpx;
+}
+.face-modal__title {
+  color: #000;
+  font-size: 36rpx;
+  font-weight: bold;
+  text-align: center;
+}
+.face-modal__row {
+  width: 552rpx;
+  display: flex;
+  padding-bottom: 24rpx;
+  margin-top: 24rpx;
+}
+.face-modal__row--spec {
+  border-bottom: 2rpx solid #f2f2f7;
+  margin-top: 36rpx;
+}
+.face-modal__icon {
+  width: 50rpx;
+  height: 50rpx;
+}
+.face-modal__col {
+  display: flex;
+  flex-direction: column;
+  margin-left: 12rpx;
+}
+.face-modal__sub-title {
+  font-size: 32rpx;
+  font-weight: bold;
+}
+.face-modal__desc {
+  width: 490rpx;
+  line-height: 44rpx;
+  margin-top: 24rpx;
+}
+.face-modal__tip {
+  width: 552rpx;
+  display: flex;
+  margin-top: 24rpx;
+  padding: 7rpx;
+  background: #f6f9fe;
+  box-sizing: border-box;
+}
+.face-modal__tip-icon {
+  width: 36rpx;
+  height: 36rpx;
+}
+.face-modal__tip-text {
+  display: flex;
+  flex-direction: column;
+  margin-left: 16rpx;
+  font-size: 24rpx;
+  line-height: 36rpx;
+}
+.face-modal__btn {
+  width: 552rpx;
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  border-radius: 40rpx;
+  color: #fff;
+  margin-top: 32rpx;
+  background: #0088ff;
+}
+.face-modal__hint {
+  width: 552rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 24rpx;
+  color: #404040;
+}
+
 /* === 加载中 === */
 .loading-state {
   display: flex; flex-direction: column; align-items: center;
@@ -540,6 +661,14 @@ onUnmounted(() => { if (timer) clearInterval(timer) })
   font-size: $font-size-lg; font-weight: $font-weight-medium; color: $uv-main-color;
   display: block; margin-bottom: 20rpx; align-self: flex-start;
 }
+.qrcode-content {
+  font-size: $font-size-base; color: $uv-content-color;
+  line-height: 1.7; word-break: break-all; align-self: flex-start;
+}
+.qrcode-fallback {
+  font-size: $font-size-base; color: $uv-content-color;
+  line-height: 1.7; word-break: break-all; align-self: flex-start;
+}
 .qrcode-box {
   width: 360rpx; height: 360rpx; background: #f8fafc;
   border-radius: 16rpx; display: flex; align-items: center;