From 9c680ea2c5938d26065232d3a658a9a615e1f827 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 13 三月 2025 16:39:14 +0800
Subject: [PATCH] fix: 修改导航 在路由上强制增加channelId

---
 apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
index e214be7..b67fd9e 100644
--- a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
@@ -9,8 +9,9 @@
       :showWeixinPay="!isInAlipay"
       :openId="wxOpenId"
       :isInWeChat="isInWeChat"
-      :isH5="isH5"
+      :isH5="isWeb"
       :appId="WXPayAppId"
+      :isFocus="isFocus"
     />
   </ContentScrollView>
 </template>
@@ -19,8 +20,8 @@
 import { SelectPayTypeView } from '@life-payment/components';
 import { LifeRechargeConstants } from '@life-payment/core-vue';
 import Taro from '@tarojs/taro';
-import { isInAlipay, isInWeChat, isH5 } from '@/utils/env';
-import { useUser } from '@/hooks';
+import { isInAlipay, isInWeChat, isH5, isWeb } from '@/utils/env';
+import { useUser, useFocus } from '@/hooks';
 import { WXPayAppId } from '@/constants';
 
 defineOptions({
@@ -33,18 +34,24 @@
 
 const { wxOpenId } = useUser();
 
+const { isFocus } = useFocus();
+
 function handePaySuccess(
   orderNo: string,
   lifePayOrderType: LifeRechargeConstants.LifePayOrderTypeEnum
 ) {
   if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.璇濊垂璁㈠崟) {
-    Taro.navigateTo({
+    Taro.redirectTo({
       url: `${RouterPath.rechargeResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`,
     });
   } else if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.鐢佃垂璁㈠崟) {
-    Taro.navigateTo({
+    Taro.redirectTo({
       url: `${RouterPath.rechargeElectricResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`,
     });
+  } else if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.鐕冩皵璁㈠崟) {
+    Taro.redirectTo({
+      url: `${RouterPath.rechargeGasResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`,
+    });
   }
 }
 </script>

--
Gitblit v1.9.1