From 192be5ad46233a4cd25880ba029997d47ad09bf6 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 20 三月 2025 17:30:34 +0800
Subject: [PATCH] fix: 三期需求
---
apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
index e214be7..892f9a6 100644
--- a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
@@ -7,10 +7,11 @@
@paySuccess="handePaySuccess"
:showAliPay="!isInWeChat"
:showWeixinPay="!isInAlipay"
- :openId="wxOpenId"
+ :getOpenId="ensureOpenId"
: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, useEnsureOpenId } from '@/hooks';
import { WXPayAppId } from '@/constants';
defineOptions({
@@ -32,19 +33,26 @@
const lifePayOrderType = Number(router.params?.lifePayOrderType ?? '');
const { wxOpenId } = useUser();
+const { ensureOpenId } = useEnsureOpenId();
+
+const { isFocus } = useFocus();
function handePaySuccess(
orderNo: string,
lifePayOrderType: LifeRechargeConstants.LifePayOrderTypeEnum
) {
if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.璇濊垂璁㈠崟) {
- Taro.navigateTo({
+ RouteHelper.redirectTo({
url: `${RouterPath.rechargeResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`,
});
} else if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.鐢佃垂璁㈠崟) {
- Taro.navigateTo({
+ RouteHelper.redirectTo({
url: `${RouterPath.rechargeElectricResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`,
});
+ } else if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.鐕冩皵璁㈠崟) {
+ RouteHelper.redirectTo({
+ url: `${RouterPath.rechargeGasResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`,
+ });
}
}
</script>
--
Gitblit v1.9.1