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 | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
index aaede98..892f9a6 100644
--- a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
@@ -5,13 +5,24 @@
:orderNo="orderNo"
:lifePayOrderType="lifePayOrderType"
@paySuccess="handePaySuccess"
+ :showAliPay="!isInWeChat"
+ :showWeixinPay="!isInAlipay"
+ :getOpenId="ensureOpenId"
+ :isInWeChat="isInWeChat"
+ :isH5="isWeb"
+ :appId="WXPayAppId"
+ :isFocus="isFocus"
/>
</ContentScrollView>
</template>
<script setup lang="ts">
-import { SelectPayTypeView, LifeRechargeConstants } from '@life-payment/components';
+import { SelectPayTypeView } from '@life-payment/components';
+import { LifeRechargeConstants } from '@life-payment/core-vue';
import Taro from '@tarojs/taro';
+import { isInAlipay, isInWeChat, isH5, isWeb } from '@/utils/env';
+import { useUser, useFocus, useEnsureOpenId } from '@/hooks';
+import { WXPayAppId } from '@/constants';
defineOptions({
name: 'selectPayType',
@@ -21,12 +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
) {
- Taro.navigateTo({
- url: `${RouterPath.rechargeResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`,
- });
+ if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.璇濊垂璁㈠崟) {
+ RouteHelper.redirectTo({
+ url: `${RouterPath.rechargeResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`,
+ });
+ } else if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.鐢佃垂璁㈠崟) {
+ 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