From c8c2f28f9008989f8035da5e78c262b326707065 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 22 五月 2025 17:04:39 +0800
Subject: [PATCH] Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui
---
apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
index 2d6676d..892f9a6 100644
--- a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
@@ -7,6 +7,11 @@
@paySuccess="handePaySuccess"
:showAliPay="!isInWeChat"
:showWeixinPay="!isInAlipay"
+ :getOpenId="ensureOpenId"
+ :isInWeChat="isInWeChat"
+ :isH5="isWeb"
+ :appId="WXPayAppId"
+ :isFocus="isFocus"
/>
</ContentScrollView>
</template>
@@ -15,7 +20,9 @@
import { SelectPayTypeView } from '@life-payment/components';
import { LifeRechargeConstants } from '@life-payment/core-vue';
import Taro from '@tarojs/taro';
-import { isInAlipay, isInWeChat } from '@/utils/env';
+import { isInAlipay, isInWeChat, isH5, isWeb } from '@/utils/env';
+import { useUser, useFocus, useEnsureOpenId } from '@/hooks';
+import { WXPayAppId } from '@/constants';
defineOptions({
name: 'selectPayType',
@@ -25,18 +32,27 @@
const orderNo = router.params?.orderNo ?? '';
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