From d739d4bd723e8440c653aa74cf2ddf7272cbf94c Mon Sep 17 00:00:00 2001
From: daxpay <daxpay@outlook.com>
Date: Fri, 31 Jul 2026 19:19:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(h5):=20PC=20=E8=81=9A=E5=90=88=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=BC=95=E5=AF=BC=E9=A1=B5=20/am/=20?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=90=BD=E5=9C=B0=E7=A0=81=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81,=20=E5=AE=8C=E6=95=B4=E5=AF=B9=E9=BD=90=20/aggregate/?=
 =?UTF-8?q?=20=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 系统浏览器/PC: 查单展示金额 + 普通链接二维码({origin}/am/{orderNo}, 手机钱包扫码拉起小程序) + 倒计时 + 轮询 + 终态结果卡
- 钱包 App 内: 保持小程序暂不可用引导, 不展示二维码
- 移动端 /am/ 引导页不变
---
 src/pc/views/aggregate-mini/index.vue | 580 ++++++++++++++++++++++++--
 1 file changed, 544 insertions(+), 36 deletions(-)

diff --git a/src/pc/views/aggregate-mini/index.vue b/src/pc/views/aggregate-mini/index.vue
index 1702468..05ff65c 100644
--- a/src/pc/views/aggregate-mini/index.vue
+++ b/src/pc/views/aggregate-mini/index.vue
@@ -1,14 +1,24 @@
 <script lang="ts" setup>
 /**
  * PC 聚合小程序引导页（/am/:orderNo）
- * 系统浏览器打开:展示"请扫码支付";钱包 App 内打开(小程序未拉起):展示"小程序暂不可用"。
- * UA 分流由 useMiniGuideEnv 处理。微信/支付宝扫码正常时由「普通链接二维码」规则拉起小程序。
- * 视觉结构与 PC aggregate/Unsupported.vue 对齐（Web 白卡风格，scoped 原生 px）。
+ *
+ * 双分支(UA 分流, useMiniGuideEnv 判定):
+ * - 系统浏览器/PC: 查单展示金额 + 落地码二维码(内容为 /am/{orderNo} 普通链接,
+ *   手机微信/支付宝扫码由「普通链接二维码」规则拉起 cashier 小程序),
+ *   倒计时 + 轮询等待小程序内支付完成, 终态(成功/关闭/失败/过期)切换结果卡。
+ * - 钱包 App 内打开(小程序未拉起): 展示"小程序暂不可用" + 当前钱包图标, 不发起支付。
+ * 视觉结构与 PC aggregate 页对齐(Web 白卡风格, scoped 原生 px)。
  */
+import type { GatewayOrderInfo } from '@/shared/api/gateway'
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRoute } from 'vue-router'
+import { getGatewayOrder } from '@/shared/api/gateway'
+import QrCodeDisplay from '@/shared/components/pay/QrCodeDisplay.vue'
+import { useGatewayOrderPoll } from '@/shared/hooks/use-gateway-order-poll'
 import { closeWebview } from '@/shared/pay/close-webview'
 import { useMiniGuideEnv } from '@/shared/pay/use-mini-guide-env'
+import { fenToYuan } from '@/shared/utils/pay-amount'
 
 defineOptions({ name: 'PcAggregateMiniGuide' })
 
@@ -18,57 +28,370 @@ const route = useRoute()
 const orderNo = (route.params.orderNo as string) || ''
 
 // UA 感知:钱包内显示"小程序暂不可用"+当前钱包图标;否则"请扫码支付"+四钱包
-const { icons, titleKey, descKey } = useMiniGuideEnv()
+const { inWallet, icons, titleKey, descKey } = useMiniGuideEnv()
+
+const loading = ref(false)
+const loadError = ref('')
+const order = ref<GatewayOrderInfo>({})
+
+const remainSeconds = ref(0)
+let countdownTimer: ReturnType<typeof setInterval> | null = null
+
+const amountYuan = computed(() => fenToYuan(order.value.amount))
+const paid = computed(() => order.value.status === 'paid')
+const closed = computed(() => order.value.status === 'closed')
+const failed = computed(() => order.value.status === 'failed')
+const expired = computed(() =>
+  order.value.status === 'expired'
+  || (remainSeconds.value <= 0 && !!order.value.expiredTime && !paid.value && !closed.value && !failed.value),
+)
+/** 终态：不可再付 */
+const terminal = computed(() =>
+  paid.value || closed.value || failed.value || order.value.status === 'expired' || expired.value,
+)
+
+/** 落地码二维码内容(与后端 GatewayPayAssistService 的 miniUrl 契约一致, 无调试 query) */
+const qrUrl = computed(() => buildMiniLandingUrl(orderNo))
+
+/** 是否展示扫码主区域 */
+const showScanArea = computed(() => !loading.value && !loadError.value && !terminal.value)
+
+/** 结果态是否有可展示的订单摘要(loadError 通常无) */
+const hasOrderSummary = computed(() => !!order.value.orderNo || !!order.value.bizOrderNo || !!order.value.title)
+
+/** 结果态：closed / failed / expired / loadError / paid */
+type ResultState = 'paid' | 'closed' | 'failed' | 'expired' | 'loadError' | ''
+const resultState = computed<ResultState>(() => {
+  if (loadError.value) {
+    return 'loadError'
+  }
+  if (paid.value) {
+    return 'paid'
+  }
+  if (closed.value) {
+    return 'closed'
+  }
+  if (failed.value) {
+    return 'failed'
+  }
+  if (order.value.status === 'expired' || expired.value) {
+    return 'expired'
+  }
+  return ''
+})
+
+const resultMeta = computed(() => {
+  switch (resultState.value) {
+    case 'paid':
+      return { titleKey: 'aggregate.paid', tipKey: 'aggregate.paidTip', color: '#07c160' }
+    case 'closed':
+      return { titleKey: 'aggregate.closed', tipKey: 'aggregate.closedTip', color: '#fa8c16' }
+    case 'failed':
+      return { titleKey: 'aggregate.failed', tipKey: 'aggregate.failedTip', color: '#ff4d4f' }
+    case 'expired':
+      return { titleKey: 'aggregate.expired', tipKey: 'aggregate.expiredTip', color: '#8c8c8c' }
+    case 'loadError':
+      return { titleKey: 'aggregate.loadFail', tipKey: 'aggregate.loadFailTip', color: '#fa8c16' }
+    default:
+      return { titleKey: '', tipKey: '', color: 'var(--h5-text-primary)' }
+  }
+})
+
+const countdown = computed(() => {
+  const s = remainSeconds.value
+  const h = String(Math.floor(s / 3600)).padStart(2, '0')
+  const m = String(Math.floor((s % 3600) / 60)).padStart(2, '0')
+  const sec = String(s % 60).padStart(2, '0')
+  return { h, m, s: sec }
+})
+
+const { startPoll, stopPoll } = useGatewayOrderPoll({
+  // 聚合 PC 等手机付完, 适当放宽轮询时长(约 10 分钟)
+  maxAttempts: 300,
+  intervalMs: 2000,
+  onUpdate(latest) {
+    order.value = latest
+  },
+  onPaid(latest) {
+    order.value = latest
+    redirectIfNeeded()
+  },
+})
+
+/**
+ * 构建聚合小程序落地 URL(供手机扫码, 由「普通链接二维码」规则拉起小程序)
+ * 不含 ?device= 等调试参数, 避免手机仍进 PC
+ */
+function buildMiniLandingUrl(no: string): string {
+  if (!no || typeof window === 'undefined') {
+    return ''
+  }
+  const base = (import.meta.env.BASE_URL || '/').replace(/\/?$/, '/')
+  const path = `${base}am/${encodeURIComponent(no)}`
+  // 合并 origin + path, 折叠多余斜杠(保留协议后的 //)
+  return `${window.location.origin}${path}`.replace(/([^:]\/)\/+/g, '$1')
+}
+
+function startCountdown(expiredTime?: string) {
+  if (countdownTimer) {
+    clearInterval(countdownTimer)
+    countdownTimer = null
+  }
+  if (!expiredTime) {
+    remainSeconds.value = 0
+    return
+  }
+  const exp = new Date(expiredTime).getTime()
+  remainSeconds.value = Math.max(0, Math.floor((exp - Date.now()) / 1000))
+  countdownTimer = setInterval(() => {
+    if (remainSeconds.value > 0) {
+      remainSeconds.value--
+    }
+    else if (countdownTimer) {
+      clearInterval(countdownTimer)
+      countdownTimer = null
+    }
+  }, 1000)
+}
+
+/** 支付成功后若有 returnUrl 则延迟跳转 */
+function redirectIfNeeded() {
+  if (order.value.returnUrl) {
+    setTimeout(() => {
+      window.location.href = order.value.returnUrl!
+    }, 1200)
+  }
+}
+
+/** 查单 + 倒计时 + 轮询(仅系统浏览器/PC 分支) */
+async function loadOrder() {
+  loading.value = true
+  loadError.value = ''
+  try {
+    order.value = await getGatewayOrder(orderNo)
+    startCountdown(order.value.expiredTime)
+    // 可支付: 展示落地码并轮询等待手机侧完成支付
+    if (!terminal.value) {
+      startPoll(orderNo)
+    }
+  }
+  catch (e: any) {
+    loadError.value = e?.message || t('aggregate.loadFail')
+  }
+  finally {
+    loading.value = false
+  }
+}
+
+// 倒计时归零: 停轮询(expired 计算会切到结果态)
+watch(expired, (isExpired) => {
+  if (isExpired && !paid.value) {
+    stopPoll()
+  }
+})
+
+onMounted(() => {
+  // 钱包内: 小程序未拉起场景, 不查单不轮询, 保持原引导提示
+  if (!inWallet) {
+    loadOrder()
+  }
+})
+
+onUnmounted(() => {
+  if (countdownTimer) {
+    clearInterval(countdownTimer)
+  }
+  stopPoll()
+})
 </script>
 
 <template>
   <div class="pc-agg-mini">
     <div class="pc-agg-mini__card">
-      <div class="pc-agg-mini__icons">
-        <img
-          v-for="icon in icons"
-          :key="icon.altKey"
-          :src="icon.src"
-          :alt="t(icon.altKey)"
-          class="pc-agg-mini__icon"
-          width="40"
-          height="40"
-        >
+      <!-- 钱包内: 小程序未拉起, 原引导提示 -->
+      <template v-if="inWallet">
+        <div class="pc-agg-mini__icons">
+          <img
+            v-for="icon in icons"
+            :key="icon.altKey"
+            :src="icon.src"
+            :alt="t(icon.altKey)"
+            class="pc-agg-mini__icon"
+          >
+        </div>
+        <!-- 标题(UA 感知:钱包内为"小程序暂不可用") -->
+        <h1 class="pc-agg-mini__title">
+          {{ t(titleKey) }}
+        </h1>
+        <!-- 描述(UA 感知) -->
+        <p class="pc-agg-mini__desc">
+          {{ t(descKey) }}
+        </p>
+        <p v-if="orderNo" class="pc-agg-mini__order">
+          {{ t('aggregate.orderNo') }} {{ orderNo }}
+        </p>
+      </template>
+
+      <!-- 系统浏览器/PC: 加载态 -->
+      <div v-else-if="loading" class="pc-agg-mini__loading">
+        <div class="pc-agg-mini__spinner" />
+        <p>{{ t('common.loading') }}</p>
       </div>
-      <!-- 标题(UA 感知:钱包内为"小程序暂不可用") -->
-      <h1 class="pc-agg-mini__title">
-        {{ t(titleKey) }}
-      </h1>
-      <!-- 描述(UA 感知) -->
-      <p class="pc-agg-mini__desc">
-        {{ t(descKey) }}
-      </p>
-      <p v-if="orderNo" class="pc-agg-mini__order">
-        {{ t('aggregate.orderNo') }} {{ orderNo }}
-      </p>
-      <!-- 关闭页面 -->
-      <button type="button" class="pc-agg-mini__close" @click="closeWebview">
-        {{ t('aggregate.closePage') }}
-      </button>
+
+      <!-- 系统浏览器/PC: 结果态(成功/关闭/失败/过期/加载失败) -->
+      <div v-else-if="resultState" class="pc-agg-mini__result">
+        <div
+          class="pc-agg-mini__result-icon"
+          :style="{ color: resultMeta.color, background: `${resultMeta.color}1a` }"
+        >
+          <svg
+            viewBox="0 0 48 48"
+            width="52"
+            height="52"
+            fill="none"
+            :stroke="resultMeta.color"
+            stroke-width="3.5"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          >
+            <!-- 支付成功 -->
+            <template v-if="resultState === 'paid'">
+              <circle cx="24" cy="24" r="17" />
+              <path d="M15 24 L22 31 L34 17" />
+            </template>
+            <!-- 支付失败 -->
+            <template v-else-if="resultState === 'failed'">
+              <path d="M14 14 L34 34 M34 14 L14 34" stroke-width="4" />
+            </template>
+            <!-- 已过期 -->
+            <template v-else-if="resultState === 'expired'">
+              <circle cx="24" cy="24" r="17" />
+              <path d="M24 13 V24 L32 28" />
+            </template>
+            <!-- 已关闭：锁 -->
+            <template v-else-if="resultState === 'closed'">
+              <rect x="10" y="22" width="28" height="18" rx="3" />
+              <path d="M15 22 V15 a9 9 0 0 1 18 0 V22" />
+            </template>
+            <!-- 加载失败：警告 -->
+            <template v-else>
+              <path d="M24 6 L43 39 H5 Z" />
+              <path d="M24 19 V29" />
+              <circle cx="24" cy="35" r="1.5" :fill="resultMeta.color" stroke="none" />
+            </template>
+          </svg>
+        </div>
+        <h1 class="pc-agg-mini__result-title">
+          {{ t(resultMeta.titleKey) }}
+        </h1>
+        <!-- loadError 态显示后端返回的具体原因, 无消息时不渲染 -->
+        <p v-if="resultState !== 'loadError' || loadError" class="pc-agg-mini__result-tip">
+          {{ resultState === 'loadError' ? loadError : t(resultMeta.tipKey) }}
+        </p>
+
+        <!-- 订单摘要: 标题 / 商户单号 / 平台单号 / 金额 -->
+        <div v-if="hasOrderSummary" class="pc-agg-mini__summary">
+          <div class="pc-agg-mini__info-row">
+            <span>{{ t('aggregate.orderTitle') }}</span>
+            <span>{{ order.title || t('aggregate.defaultTitle') }}</span>
+          </div>
+          <div v-if="order.bizOrderNo" class="pc-agg-mini__info-row">
+            <span>{{ t('aggregate.bizOrderNo') }}</span>
+            <span>{{ order.bizOrderNo }}</span>
+          </div>
+          <div v-if="order.orderNo" class="pc-agg-mini__info-row">
+            <span>{{ t('aggregate.orderNo') }}</span>
+            <span>{{ order.orderNo }}</span>
+          </div>
+          <div v-if="order.amount != null" class="pc-agg-mini__info-row">
+            <span>{{ t('aggregate.amount') }}</span>
+            <span class="pc-agg-mini__info-amount">¥{{ amountYuan }}</span>
+          </div>
+        </div>
+
+        <!-- 关闭页面(异常/成功兜底) -->
+        <button type="button" class="pc-agg-mini__close" @click="closeWebview">
+          {{ t('aggregate.closePage') }}
+        </button>
+      </div>
+
+      <!-- 系统浏览器/PC: 可支付, 金额 + 落地码 + 引导 + 订单摘要 -->
+      <template v-else-if="showScanArea">
+        <div class="pc-agg-mini__amount">
+          <span class="pc-agg-mini__currency">¥</span>
+          <span class="pc-agg-mini__amount-num">{{ amountYuan }}</span>
+        </div>
+
+        <div class="pc-agg-mini__qr">
+          <div class="pc-agg-mini__qr-box">
+            <QrCodeDisplay v-if="qrUrl" :content="qrUrl" :size="240" />
+          </div>
+          <div v-if="remainSeconds > 0" class="pc-agg-mini__countdown">
+            <!-- 剩余支付时间 -->
+            <span class="pc-agg-mini__countdown-label">{{ t('aggregate.remainingTime') }}</span>
+            <span class="pc-agg-mini__countdown-item">{{ countdown.h }}</span>
+            <span class="pc-agg-mini__countdown-sep">:</span>
+            <span class="pc-agg-mini__countdown-item">{{ countdown.m }}</span>
+            <span class="pc-agg-mini__countdown-sep">:</span>
+            <span class="pc-agg-mini__countdown-item">{{ countdown.s }}</span>
+          </div>
+        </div>
+
+        <div class="pc-agg-mini__scan-tip">
+          <div class="pc-agg-mini__icons">
+            <img
+              v-for="icon in icons"
+              :key="icon.altKey"
+              :src="icon.src"
+              :alt="t(icon.altKey)"
+              class="pc-agg-mini__icon"
+            >
+          </div>
+          <!-- 请使用钱包扫一扫完成支付 -->
+          <p class="pc-agg-mini__scan-text">
+            {{ t('aggregate.scanWithWallet') }}
+          </p>
+        </div>
+
+        <!-- 订单摘要: Web 宽屏默认展示, 无需折叠 -->
+        <div class="pc-agg-mini__summary">
+          <div class="pc-agg-mini__info-row">
+            <span>{{ t('aggregate.orderTitle') }}</span>
+            <span>{{ order.title || t('aggregate.defaultTitle') }}</span>
+          </div>
+          <div v-if="order.description" class="pc-agg-mini__info-row">
+            <span>{{ t('aggregate.description') }}</span>
+            <span>{{ order.description }}</span>
+          </div>
+          <div v-if="order.bizOrderNo" class="pc-agg-mini__info-row">
+            <span>{{ t('aggregate.bizOrderNo') }}</span>
+            <span>{{ order.bizOrderNo }}</span>
+          </div>
+          <div class="pc-agg-mini__info-row">
+            <span>{{ t('aggregate.orderNo') }}</span>
+            <span>{{ order.orderNo }}</span>
+          </div>
+        </div>
+      </template>
     </div>
   </div>
 </template>
 
 <style scoped>
-/* PC：scoped 原生 px，禁止 UnoCSS 长度类 */
+/* PC Web: scoped 原生 px, 禁止 UnoCSS 长度类 */
 .pc-agg-mini {
   min-height: 100vh;
   display: flex;
   align-items: center;
   justify-content: center;
+  background: var(--h5-bg-page);
   padding: 40px 24px;
   box-sizing: border-box;
-  background: var(--h5-bg-page);
 }
 
 .pc-agg-mini__card {
   width: 100%;
-  max-width: 480px;
+  max-width: 540px;
   padding: 40px 36px 32px;
   background: var(--h5-bg-card);
   border-radius: 12px;
@@ -77,21 +400,169 @@ const { icons, titleKey, descKey } = useMiniGuideEnv()
   box-sizing: border-box;
 }
 
+.pc-agg-mini__loading {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 12px;
+  padding: 56px 0;
+  color: var(--h5-text-secondary);
+  font-size: 14px;
+}
+
+.pc-agg-mini__spinner {
+  width: 28px;
+  height: 28px;
+  border: 3px solid #e4e7ed;
+  border-top-color: #4787f7;
+  border-radius: 50%;
+  animation: pc-agg-mini-spin 0.8s linear infinite;
+}
+
+@keyframes pc-agg-mini-spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.pc-agg-mini__amount {
+  margin-bottom: 28px;
+  line-height: 1.1;
+}
+
+.pc-agg-mini__currency {
+  font-size: 22px;
+  font-weight: 500;
+  color: #ff4d4f;
+  margin-right: 4px;
+  vertical-align: super;
+}
+
+.pc-agg-mini__amount-num {
+  font-size: 44px;
+  font-weight: 600;
+  color: #ff4d4f;
+  letter-spacing: -0.5px;
+}
+
+.pc-agg-mini__qr {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-bottom: 8px;
+}
+
+.pc-agg-mini__qr-box {
+  width: 280px;
+  height: 280px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid #ebeef5;
+  border-radius: 8px;
+  margin-bottom: 16px;
+  background: var(--h5-bg-muted);
+}
+
+.pc-agg-mini__countdown {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+  font-size: 14px;
+}
+
+.pc-agg-mini__countdown-label {
+  color: var(--h5-text-secondary);
+  margin-right: 6px;
+}
+
+.pc-agg-mini__countdown-item {
+  display: inline-block;
+  min-width: 28px;
+  padding: 3px 6px;
+  background: #ff4d4f;
+  color: #fff;
+  font-size: 14px;
+  font-weight: 600;
+  border-radius: 4px;
+  text-align: center;
+  line-height: 1.3;
+  box-sizing: border-box;
+  font-variant-numeric: tabular-nums;
+}
+
+.pc-agg-mini__countdown-sep {
+  font-size: 14px;
+  font-weight: 600;
+  color: #ff4d4f;
+}
+
+.pc-agg-mini__scan-tip {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 12px;
+  padding: 20px 0 4px;
+}
+
 .pc-agg-mini__icons {
   display: flex;
   align-items: center;
   justify-content: center;
-  gap: 18px;
-  margin-bottom: 20px;
+  gap: 16px;
 }
 
 .pc-agg-mini__icon {
   display: block;
-  width: 40px;
-  height: 40px;
+  width: 36px;
+  height: 36px;
   object-fit: contain;
 }
 
+.pc-agg-mini__scan-text {
+  margin: 0;
+  font-size: 14px;
+  color: var(--h5-text-secondary);
+  line-height: 1.6;
+}
+
+/* 订单摘要: 左右标签值, Web 表格式信息区 */
+.pc-agg-mini__summary {
+  margin-top: 24px;
+  padding-top: 20px;
+  border-top: 1px solid var(--h5-border);
+  text-align: left;
+}
+
+.pc-agg-mini__info-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  gap: 24px;
+  padding: 8px 0;
+  font-size: 13px;
+  line-height: 1.5;
+}
+
+.pc-agg-mini__info-row > span:first-child {
+  color: var(--h5-text-secondary);
+  flex-shrink: 0;
+  min-width: 88px;
+}
+
+.pc-agg-mini__info-row > span:last-child {
+  color: var(--h5-text-primary);
+  text-align: right;
+  word-break: break-all;
+}
+
+.pc-agg-mini__info-amount {
+  color: #ff4d4f !important;
+  font-weight: 600;
+}
+
+/* 钱包内引导标题/描述/订单号(与钱包内分支共用) */
 .pc-agg-mini__title {
   margin: 0 0 10px;
   font-size: 20px;
@@ -117,6 +588,43 @@ const { icons, titleKey, descKey } = useMiniGuideEnv()
   line-height: 1.5;
 }
 
+.pc-agg-mini__result {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 16px 0 4px;
+}
+
+.pc-agg-mini__result-icon {
+  width: 80px;
+  height: 80px;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 18px;
+}
+
+.pc-agg-mini__result-title {
+  margin: 0 0 8px;
+  font-size: 20px;
+  font-weight: 600;
+  color: var(--h5-text-primary);
+  line-height: 1.4;
+}
+
+.pc-agg-mini__result-tip {
+  margin: 0;
+  font-size: 14px;
+  color: var(--h5-text-secondary);
+  line-height: 1.6;
+  max-width: 360px;
+}
+
+.pc-agg-mini__result .pc-agg-mini__summary {
+  width: 100%;
+}
+
 .pc-agg-mini__close {
   margin-top: 24px;
   width: 100%;