From add9b3bb61fcc337b02c15e7973967d670e7d3be Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 21 五月 2025 17:17:28 +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 | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 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..892f9a6 100644
--- a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
@@ -1,23 +1,58 @@
<template>
<ContentScrollView>
- <SelectPayTypeView style="margin-top: 40px" @paySuccess="handePaySuccess" />
+ <SelectPayTypeView
+ style="margin-top: 40px"
+ :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',
});
+const router = Taro.useRouter();
+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