From db365a5eff31c040c42463df4966bf34a5de6a6d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 12 三月 2025 15:00:42 +0800
Subject: [PATCH] fix: 二期需求

---
 apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
index e214be7..85256c2 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,6 +34,8 @@
 
 const { wxOpenId } = useUser();
 
+const { isFocus } = useFocus();
+
 function handePaySuccess(
   orderNo: string,
   lifePayOrderType: LifeRechargeConstants.LifePayOrderTypeEnum
@@ -45,6 +48,10 @@
     Taro.navigateTo({
       url: `${RouterPath.rechargeElectricResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`,
     });
+  } else if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.鐕冩皵璁㈠崟) {
+    Taro.navigateTo({
+      url: `${RouterPath.rechargeGasResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`,
+    });
   }
 }
 </script>

--
Gitblit v1.9.1