From 538e4f454ba3126ef92278ab9cb675adb9e3b287 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 27 三月 2025 09:30:55 +0800
Subject: [PATCH] Merge branch 'master' into dev-1.3
---
apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue b/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue
index f6549ba..4b3e585 100644
--- a/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue
@@ -1,20 +1,59 @@
<template>
- <ContentScrollView :paddingH="false">
- <PhoneBillRecharge @goPay="goPay" />
+ <ContentScrollView :paddingH="false" style="background-color: #fff">
+ <PhoneBillRecharge
+ @goPay="goPay"
+ :isDev="isDev"
+ @paySuccess="handePaySuccess"
+ :getOpenId="ensureOpenId"
+ :isInWeChat="isInWeChat"
+ :isInAlipay="isInAlipay"
+ :isH5="isWeb"
+ :appId="WXPayAppId"
+ :isFocus="isFocus"
+ :showAliPay="!isInWeChat"
+ :showWeixinPay="isInWeChat"
+ @missName="handleMissName"
+ />
</ContentScrollView>
</template>
<script setup lang="ts">
-import { PhoneBillRecharge, BlLifeRecharge } from '@life-payment/components';
+import { PhoneBillRecharge } from '@life-payment/components';
+import { BlLifeRecharge } 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';
+import { Message } from '@/utils';
defineOptions({
name: 'InnerPage',
});
+const isDev = process.env.NODE_ENV === 'development';
+
+const { wxOpenId } = useUser();
+const { ensureOpenId } = useEnsureOpenId();
+const { isFocus } = useFocus();
+
function goPay(orderNo: string) {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.selectPayType}?orderNo=${orderNo}&lifePayOrderType=${BlLifeRecharge.constants.LifePayOrderTypeEnum.璇濊垂璁㈠崟}`,
});
}
+
+function handePaySuccess(orderNo: string) {
+ RouteHelper.navigateTo({
+ url: `${RouterPath.rechargeResult}?orderNo=${orderNo}&lifePayOrderType=${BlLifeRecharge.constants.LifePayOrderTypeEnum.璇濊垂璁㈠崟}`,
+ });
+}
+
+async function handleMissName(userAccountId: string) {
+ try {
+ await Message.confirm({ message: '璇峰厛瀹屽杽鎵嬫満鍙锋墍灞炴満涓诲鍚�' });
+ RouteHelper.navigateTo({
+ url: `${RouterPath.editPhoneUserAccount}?id=${userAccountId}`,
+ });
+ } catch (error) {}
+}
</script>
--
Gitblit v1.9.1