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 | 44 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 39 insertions(+), 5 deletions(-) diff --git a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue index d1ea8c1..85256c2 100644 --- a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue +++ b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue @@ -1,23 +1,57 @@ <template> <ContentScrollView> - <SelectPayTypeView style="margin-top: 40px" @paySuccess="handePaySuccess" /> + <SelectPayTypeView + style="margin-top: 40px" + :orderNo="orderNo" + :lifePayOrderType="lifePayOrderType" + @paySuccess="handePaySuccess" + :showAliPay="!isInWeChat" + :showWeixinPay="!isInAlipay" + :openId="wxOpenId" + :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 } from '@/hooks'; +import { WXPayAppId } from '@/constants'; defineOptions({ name: 'selectPayType', }); +const router = Taro.useRouter(); +const orderNo = router.params?.orderNo ?? ''; +const lifePayOrderType = Number(router.params?.lifePayOrderType ?? ''); + +const { wxOpenId } = useUser(); + +const { isFocus } = useFocus(); + function handePaySuccess( orderNo: string, lifePayOrderType: LifeRechargeConstants.LifePayOrderTypeEnum ) { - Taro.navigateTo({ - url: `${RouterPath.rechargeResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`, - }); + if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.璇濊垂璁㈠崟) { + Taro.navigateTo({ + url: `${RouterPath.rechargeResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`, + }); + } else if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.鐢佃垂璁㈠崟) { + 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