From 044b26d0353fab6eb67c6c67352e34ed19ca2ebf Mon Sep 17 00:00:00 2001
From: jacobxu666 <jacobxu666@gmail.com>
Date: Mon, 28 Sep 2026 20:02:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A7=E4=BB=B6=E5=94=A4=E8=B5=B7?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA=E6=94=B9=E4=B8=BA=E3=80=8C?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=B7=B2=E5=8F=96=E6=B6=88=EF=BC=8C=E8=AF=B7?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=94=AF=E4=BB=98=E3=80=8D=EF=BC=8C[?=
 =?UTF-8?q?=E8=AF=8A=E6=96=AD]=E8=A1=8C=E6=9A=82=E7=95=99=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E7=9C=9F=E5=AE=9E=E9=94=99=E8=AF=AF=E7=A0=81=E4=BB=A5?=
 =?UTF-8?q?=E4=BE=BF=E5=8C=BA=E5=88=86=E5=8F=96=E6=B6=88=E4=B8=8E=E5=AE=B9?=
 =?UTF-8?q?=E5=99=A8=E4=B8=8D=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 common/petrolVoucher.js       |  1 +
 pages/petrol/orderConfirm.vue | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/common/petrolVoucher.js b/common/petrolVoucher.js
index 4e878f7..dc13b84 100644
--- a/common/petrolVoucher.js
+++ b/common/petrolVoucher.js
@@ -7,6 +7,7 @@ export const VOUCHER_PRICE_TEXT = '200.00'
 export const VOUCHER_NAME = '怀化石油汽油电子券'
 
 export const VOUCHER_GUIDE_TEXT = '请在「云闪付 App」里的「湖南社保卡」小程序首页进入「怀化社保卡」活动中完成购买'
+export const VOUCHER_CANCEL_TEXT = '支付已取消，请重新支付'
 
 // 券详情页「使用规则 / 使用流程 / 重要须知」文案，来自石油侧材料（决策 14）
 export const VOUCHER_USE_RULES = [
diff --git a/pages/petrol/orderConfirm.vue b/pages/petrol/orderConfirm.vue
index 0d2b36c..af61e89 100644
--- a/pages/petrol/orderConfirm.vue
+++ b/pages/petrol/orderConfirm.vue
@@ -52,7 +52,7 @@
 
 <script>
 import {
-	VOUCHER_NAME, VOUCHER_PRICE_TEXT, VOUCHER_GUIDE_TEXT,
+		VOUCHER_NAME, VOUCHER_PRICE_TEXT, VOUCHER_GUIDE_TEXT, VOUCHER_CANCEL_TEXT,
 	bizOk, bizMsg, bizData
 } from '@/common/petrolVoucher.js'
 
@@ -165,6 +165,8 @@ export default {
 			const ready = await this.loadUpSdk()
 			if (!ready) {
 				this.submitting = false
+				// xuchao: 临时诊断（定位弹窗真因后移除）：SDK 加载不出来时展示 UA 片段
+				this.guideText = '支付SDK未能加载[诊断] UA=' + (typeof navigator !== 'undefined' ? String(navigator.userAgent).slice(0, 120) : 'N/A')
 				this.guideModal = true
 				return
 			}
@@ -174,10 +176,11 @@ export default {
 					success: () => {
 						uni.redirectTo({ url: '/pages/petrol/voucherDetail?orderNo=' + this.orderNo })
 					},
-					fail: () => {
-						// xuchao: 唤起失败（多为不在云闪付内）→ 指引模态；云闪付内取消也会走这里，
-						//         订单仍保留可"继续支付"，统一用文案引导，不做环境猜测
+					fail: (err) => {
+						// xuchao: 控件回调失败（含用户取消）。按 xuchao 要求文案定为取消提示；
+						//         [诊断] 行临时保留采集真实错误码，区分"取消"与"容器不支持"后移除并分文案
 						this.submitting = false
+						this.guideText = VOUCHER_CANCEL_TEXT + '\n[诊断] ' + JSON.stringify(err || {})
 						this.guideModal = true
 					}
 				})