From 73ac6d02a2223f19201426f3c366661d4a8e41bf Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 25 二月 2025 17:14:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront
---
apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 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..e214be7 100644
--- a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
@@ -1,23 +1,50 @@
<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="isH5"
+ :appId="WXPayAppId"
+ />
</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 } from '@/utils/env';
+import { useUser } 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();
+
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}`,
+ });
+ }
}
</script>
--
Gitblit v1.9.1