From f92c5f96130cfd5bd6cd9aa48202fe1aad787f22 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Mon, 20 Jul 2026 21:30:11 +0800
Subject: [PATCH] =?UTF-8?q?refactor(h5/aggregate):=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=81=9A=E5=90=88=E6=94=AF=E4=BB=98=E7=BB=88=E6=80=81=E8=A7=86?=
 =?UTF-8?q?=E8=A7=89=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 成功态隐藏主卡片、补传订单摘要，与异常终态/PC 端布局对齐

- loadError 补 brand 色块，作为结果卡负 margin 的叠放对象
---
 src/mobile/views/aggregate/alipay/Index.vue         | 13 ++++++++-----
 .../aggregate/components/AggregateResultCard.vue    |  6 +++---
 src/mobile/views/aggregate/douyin/Index.vue         | 13 ++++++++-----
 src/mobile/views/aggregate/union-pay/Index.vue      | 13 ++++++++-----
 src/mobile/views/aggregate/wechat/Index.vue         | 13 ++++++++-----
 5 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/mobile/views/aggregate/alipay/Index.vue b/src/mobile/views/aggregate/alipay/Index.vue
index d74bf77..cdf8e2f 100644
--- a/src/mobile/views/aggregate/alipay/Index.vue
+++ b/src/mobile/views/aggregate/alipay/Index.vue
@@ -120,15 +120,18 @@ onMounted(() => {
       :tip-key="maskTipKey"
     />
 
-    <!-- 加载错误 -->
-    <AggregateResultCard v-else-if="loadError" state="loadError" :message="loadError" />
+    <!-- 加载错误：补 brand 色块作为结果卡负 margin 的叠放对象，与其他终态视觉一致 -->
+    <template v-else-if="loadError">
+      <div class="agg__brand" />
+      <AggregateResultCard state="loadError" :message="loadError" />
+    </template>
 
     <template v-else>
       <!-- 顶部品牌色装饰区（半透明圆点缀） -->
       <div class="agg__brand" />
 
-      <!-- 订单信息卡片（异常终态时隐藏，订单信息降级到结果卡摘要） -->
-      <div v-if="!abnormalTerminal" class="agg__card agg__card--main">
+      <!-- 订单信息卡片（终态时隐藏，订单信息降级到结果卡摘要） -->
+      <div v-if="!paid && !abnormalTerminal" class="agg__card agg__card--main">
         <div class="agg__title">
           {{ order.title || t('aggregate.defaultTitle') }}
         </div>
@@ -151,7 +154,7 @@ onMounted(() => {
       </div>
 
       <!-- 支付成功 -->
-      <AggregateResultCard v-if="paid" state="paid" :brand-color="BRAND_COLOR" />
+      <AggregateResultCard v-if="paid" state="paid" :brand-color="BRAND_COLOR" :summary="orderSummary" />
 
       <!-- 终态（非支付成功：失败/关闭/过期） -->
       <AggregateResultCard v-else-if="terminal" :state="terminalState" :summary="orderSummary" />
diff --git a/src/mobile/views/aggregate/components/AggregateResultCard.vue b/src/mobile/views/aggregate/components/AggregateResultCard.vue
index c5b06db..5cea9ee 100644
--- a/src/mobile/views/aggregate/components/AggregateResultCard.vue
+++ b/src/mobile/views/aggregate/components/AggregateResultCard.vue
@@ -28,7 +28,7 @@ const props = defineProps<{
   brandColor?: string
   // 加载失败时的动态消息（覆盖默认标题文案）
   message?: string
-  // 订单摘要项（可选）：异常终态时附属在副提示下方，展示订单关键信息（对齐 PC 端 summary）
+  // 订单摘要项（可选）：终态时附属在副提示下方，展示订单关键信息（对齐 PC 端 summary）
   summary?: Array<{ label: string, value: string }>
 }>()
 
@@ -119,7 +119,7 @@ function handleClose() {
     <p class="agg-result__tip">
       {{ t(meta.tipKey) }}
     </p>
-    <!-- 订单摘要（异常终态时展示订单关键信息，对齐 PC 端 summary） -->
+    <!-- 订单摘要（终态时展示订单关键信息，对齐 PC 端 summary） -->
     <div v-if="summary && summary.length" class="agg-result__summary">
       <div v-for="(item, index) in summary" :key="index" class="agg-result__summary-row">
         <span class="agg-result__summary-label">{{ item.label }}</span>
@@ -185,7 +185,7 @@ function handleClose() {
   line-height: 1.6;
 }
 
-/* 订单摘要区：异常终态时附属在副提示下方，左右对齐的表格式信息（对齐 PC 端） */
+/* 订单摘要区：终态时附属在副提示下方，左右对齐的表格式信息（对齐 PC 端） */
 .agg-result__summary {
   width: 100%;
   margin-top: 16px;
diff --git a/src/mobile/views/aggregate/douyin/Index.vue b/src/mobile/views/aggregate/douyin/Index.vue
index 26ccc0f..7c63e0e 100644
--- a/src/mobile/views/aggregate/douyin/Index.vue
+++ b/src/mobile/views/aggregate/douyin/Index.vue
@@ -120,15 +120,18 @@ onMounted(() => {
       :tip-key="maskTipKey"
     />
 
-    <!-- 加载错误 -->
-    <AggregateResultCard v-else-if="loadError" state="loadError" :message="loadError" />
+    <!-- 加载错误：补 brand 色块作为结果卡负 margin 的叠放对象，与其他终态视觉一致 -->
+    <template v-else-if="loadError">
+      <div class="agg__brand" />
+      <AggregateResultCard state="loadError" :message="loadError" />
+    </template>
 
     <template v-else>
       <!-- 顶部品牌色装饰区（半透明圆点缀） -->
       <div class="agg__brand" />
 
-      <!-- 订单信息卡片（异常终态时隐藏，订单信息降级到结果卡摘要） -->
-      <div v-if="!abnormalTerminal" class="agg__card agg__card--main">
+      <!-- 订单信息卡片（终态时隐藏，订单信息降级到结果卡摘要） -->
+      <div v-if="!paid && !abnormalTerminal" class="agg__card agg__card--main">
         <div class="agg__title">
           {{ order.title || t('aggregate.defaultTitle') }}
         </div>
@@ -151,7 +154,7 @@ onMounted(() => {
       </div>
 
       <!-- 支付成功 -->
-      <AggregateResultCard v-if="paid" state="paid" :brand-color="BRAND_COLOR" />
+      <AggregateResultCard v-if="paid" state="paid" :brand-color="BRAND_COLOR" :summary="orderSummary" />
 
       <!-- 终态（非支付成功：失败/关闭/过期） -->
       <AggregateResultCard v-else-if="terminal" :state="terminalState" :summary="orderSummary" />
diff --git a/src/mobile/views/aggregate/union-pay/Index.vue b/src/mobile/views/aggregate/union-pay/Index.vue
index 49aa153..b33c9c3 100644
--- a/src/mobile/views/aggregate/union-pay/Index.vue
+++ b/src/mobile/views/aggregate/union-pay/Index.vue
@@ -120,15 +120,18 @@ onMounted(() => {
       :tip-key="maskTipKey"
     />
 
-    <!-- 加载错误 -->
-    <AggregateResultCard v-else-if="loadError" state="loadError" :message="loadError" />
+    <!-- 加载错误：补 brand 色块作为结果卡负 margin 的叠放对象，与其他终态视觉一致 -->
+    <template v-else-if="loadError">
+      <div class="agg__brand" />
+      <AggregateResultCard state="loadError" :message="loadError" />
+    </template>
 
     <template v-else>
       <!-- 顶部品牌色装饰区（半透明圆点缀） -->
       <div class="agg__brand" />
 
-      <!-- 订单信息卡片（异常终态时隐藏，订单信息降级到结果卡摘要） -->
-      <div v-if="!abnormalTerminal" class="agg__card agg__card--main">
+      <!-- 订单信息卡片（终态时隐藏，订单信息降级到结果卡摘要） -->
+      <div v-if="!paid && !abnormalTerminal" class="agg__card agg__card--main">
         <div class="agg__title">
           {{ order.title || t('aggregate.defaultTitle') }}
         </div>
@@ -151,7 +154,7 @@ onMounted(() => {
       </div>
 
       <!-- 支付成功 -->
-      <AggregateResultCard v-if="paid" state="paid" :brand-color="BRAND_COLOR" />
+      <AggregateResultCard v-if="paid" state="paid" :brand-color="BRAND_COLOR" :summary="orderSummary" />
 
       <!-- 终态（非支付成功：失败/关闭/过期） -->
       <AggregateResultCard v-else-if="terminal" :state="terminalState" :summary="orderSummary" />
diff --git a/src/mobile/views/aggregate/wechat/Index.vue b/src/mobile/views/aggregate/wechat/Index.vue
index c9fd537..1b4a91e 100644
--- a/src/mobile/views/aggregate/wechat/Index.vue
+++ b/src/mobile/views/aggregate/wechat/Index.vue
@@ -123,15 +123,18 @@ onMounted(() => {
       :tip-key="maskTipKey"
     />
 
-    <!-- 加载错误 -->
-    <AggregateResultCard v-else-if="loadError" state="loadError" :message="loadError" />
+    <!-- 加载错误：补 brand 色块作为结果卡负 margin 的叠放对象，与其他终态视觉一致 -->
+    <template v-else-if="loadError">
+      <div class="agg__brand" />
+      <AggregateResultCard state="loadError" :message="loadError" />
+    </template>
 
     <template v-else>
       <!-- 顶部品牌色装饰区（半透明圆点缀） -->
       <div class="agg__brand" />
 
-      <!-- 订单信息卡片（异常终态时隐藏，订单信息降级到结果卡摘要） -->
-      <div v-if="!abnormalTerminal" class="agg__card agg__card--main">
+      <!-- 订单信息卡片（终态时隐藏，订单信息降级到结果卡摘要） -->
+      <div v-if="!paid && !abnormalTerminal" class="agg__card agg__card--main">
         <div class="agg__title">
           {{ order.title || t('aggregate.defaultTitle') }}
         </div>
@@ -154,7 +157,7 @@ onMounted(() => {
       </div>
 
       <!-- 支付成功 -->
-      <AggregateResultCard v-if="paid" state="paid" :brand-color="BRAND_COLOR" />
+      <AggregateResultCard v-if="paid" state="paid" :brand-color="BRAND_COLOR" :summary="orderSummary" />
 
       <!-- 终态（非支付成功：失败/关闭/过期） -->
       <AggregateResultCard v-else-if="terminal" :state="terminalState" :summary="orderSummary" />