From a9067f4725e166d68e15275116c890ab48c3fa39 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Sun, 11 May 2025 22:15:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../daxpay/h5/aggregate/wechat/WechatAggregate.vue   |  6 +++---
 .../daxpay/h5/code/alipay/AlipayCashierCode.vue      |  6 +++---
 .../daxpay/h5/code/wechat/WechatCashierCode.vue      | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/daxpay/h5/aggregate/wechat/WechatAggregate.vue b/src/views/daxpay/h5/aggregate/wechat/WechatAggregate.vue
index cc1cc50..7191062 100644
--- a/src/views/daxpay/h5/aggregate/wechat/WechatAggregate.vue
+++ b/src/views/daxpay/h5/aggregate/wechat/WechatAggregate.vue
@@ -187,12 +187,12 @@ async function wxAuth() {
   // 认证获取OpenId
   await auth(authParam.value).then(({ data, code, msg }) => {
     if (code) {
-      router.push({ name: 'payFail', query: { msg }, replace: true })
+      router.replace({ name: 'payFail', query: { msg }, replace: true })
       return
     }
     openId.value = data.openId as string
   }).catch((res) => {
-    router.push({ name: 'payFail', query: { msg: res.message }, replace: true })
+    router.replace({ name: 'payFail', query: { msg: res.message }, replace: true })
   })
 }
 
@@ -210,7 +210,7 @@ function pay() {
     aggregatePay(from)
       .then(({ data, code, msg }) => {
         if (code) {
-          router.push({ name: 'payFail', query: { msg }, replace: true })
+          router.replace({ name: 'payFail', query: { msg }, replace: true })
           return
         }
         // 根据类型拉起对应的支付。 支持跳转和jsapi
diff --git a/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue b/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue
index 9dae89e..70df632 100644
--- a/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue
+++ b/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue
@@ -84,7 +84,7 @@ const showRemark = ref<boolean>(false) // 是否展示备注
 const loading = ref<boolean>(false) // 加载状态
 const cashierInfo = ref<GatewayCashierConfig>()
 const amount = ref<string>('0') // 金额
-const description = ref<string>('') // 描述
+const description = ref<string>()
 
 const { input, del } = useKeyboard(amount)
 
@@ -101,14 +101,14 @@ function initData() {
   getCashierCodeConfig(code, CashierCodeTypeEnum.ALIPAY)
     .then((res) => {
       if (res.code) {
-        router.push({ name: 'payFail', query: { msg: res.msg } })
+        router.replace({ name: 'payFail', query: { msg: res.msg } })
         return
       }
       loading.value = false
       cashierInfo.value = res.data as any
     })
     .catch((res) => {
-      router.push({ name: 'payFail', query: { msg: res.message } })
+      router.replace({ name: 'payFail', query: { msg: res.message } })
     })
 }
 
diff --git a/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue b/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue
index b142966..96d16c9 100644
--- a/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue
+++ b/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue
@@ -97,8 +97,8 @@ const showRemark = ref<boolean>(false)
 const loading = ref<boolean>(false)
 const cashierInfo = ref<GatewayCashierConfig>({})
 const amount = ref<string>('0')
-const description = ref<string>('')
-const openId = ref<string>('')
+const description = ref<string>()
+const openId = ref<string>()
 
 const { input, del } = useKeyboard(amount)
 
@@ -141,13 +141,13 @@ async function init() {
           auth({ cashierCode: cashierCode as string, cashierType: CashierCodeTypeEnum.WECHAT_PAY, authCode: authCode as string })
             .then((res) => {
               if (res.code) {
-                router.push({ name: 'payFail', query: { msg: res.msg } })
+                router.replace({ name: 'payFail', query: { msg: res.msg } })
                 return
               }
               openId.value = res.data.openId as string
               show.value = true
             }).catch((res) => {
-              router.push({ name: 'payFail', query: { msg: res.message }, replace: true })
+              router.replace({ name: 'payFail', query: { msg: res.message }, replace: true })
             })
         }
       }
@@ -156,7 +156,7 @@ async function init() {
       }
     })
     .catch((error) => {
-      router.push({ name: 'payFail', query: { msg: error } })
+      router.replace({ name: 'payFail', query: { msg: error } })
     })
 }
 
@@ -181,7 +181,7 @@ function pay() {
   cashierPay(from)
     .then((res) => {
       if (res.code) {
-        router.push({ name: 'payFail', query: { msg: res.msg } })
+        router.replace({ name: 'payFail', query: { msg: res.msg } })
         return
       }
       loading.value = false