From 1910e9f27373b8b4da75f076762025ceb3419965 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 12 六月 2025 15:40:50 +0800
Subject: [PATCH] fix: 暂时隐藏电信充值通道
---
apps/taro/src/hooks/user.ts | 132 +++++++++++++++++++++++++++++++++++---------
1 files changed, 105 insertions(+), 27 deletions(-)
diff --git a/apps/taro/src/hooks/user.ts b/apps/taro/src/hooks/user.ts
index 3dd00bb..0125a2e 100644
--- a/apps/taro/src/hooks/user.ts
+++ b/apps/taro/src/hooks/user.ts
@@ -1,13 +1,41 @@
import { useUserStore } from '@/stores/modules/user';
import Taro from '@tarojs/taro';
import { object2query } from '@life-payment/utils';
-import * as userServices from '@life-payment/services/api/User';
import { useQuery } from '@tanstack/vue-query';
import { MaybeRef } from 'vue';
import { useRefeshDidShow } from './infiniteLoading';
import { LoginFormTabs } from '@/subpackages/login/constants';
import { useLoginedJump } from './login';
-import { useLifeRechargeContext, APIgetLifePayWxIndentityParams } from '@life-payment/core-vue';
+import {
+ useLifeRechargeContext,
+ APIgetLifePayWxIndentityParams,
+ WxMiniAppIndentityInfo,
+ LifePayPhoneMesssageCodeLoginOutput,
+} from '@life-payment/core-vue';
+import { isInWeChat } from '@/utils/env';
+
+export function useVirtualUserInfo() {
+ const { blLifeRecharge } = useLifeRechargeContext();
+
+ const { data: virtualUserInfo } = useQuery({
+ queryKey: ['blLifeRecharge/lifePayUserMesssageByIduser', blLifeRecharge.accountModel.userId],
+ queryFn: async () => {
+ return await blLifeRecharge.services.lifePayUserMesssageByIduser(
+ {
+ id: blLifeRecharge.accountModel.userId,
+ },
+ {
+ showLoading: false,
+ }
+ );
+ },
+ placeholderData: () => ({} as LifePayPhoneMesssageCodeLoginOutput),
+ enabled: computed(() => !!blLifeRecharge.accountModel.userId),
+ staleTime: Infinity,
+ });
+
+ return { virtualUserInfo };
+}
export function useUser() {
const userStore = useUserStore();
@@ -26,6 +54,12 @@
return userStore.getCurrentUserInfo();
}
+ const { blLifeRecharge } = useLifeRechargeContext();
+ // const { virtualUserInfo } = useVirtualUserInfo();
+
+ const isChannelAccount = computed(() => blLifeRecharge.accountModel.isBackClientUser);
+ const userPromoterIdNumber = computed(() => blLifeRecharge.accountModel.promoterIdNumber);
+
return {
user: userInfo,
userDetail: userDetail,
@@ -35,6 +69,9 @@
virtualPhoneNumber,
wxCode,
wxOpenId,
+ isChannelAccount,
+ userPromoterIdNumber,
+ // virtualUserInfo,
};
}
@@ -57,13 +94,14 @@
const isAuth = computed(() => !needAuth || isLogin.value);
const router = Taro.useRouter();
+ useInitWeixinJSBridge();
Taro.useReady(async () => {
if (isLogin.value && userStore.firstGetUserDetail) {
// userStore.getCurrentUserInfo();
}
if (needAuth && !isLogin.value) {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.loginByForm}?redirect=${router.path}&${object2query(router.params)}`,
});
}
@@ -82,41 +120,81 @@
const { blLifeRecharge } = useLifeRechargeContext();
- Taro.useReady(async () => {
- if (!code && !!WeixinJSBridge && !wxCode) {
- location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf940ff1d35a98493&redirect_uri=${location.href}&response_type=code&scope=snsapi_base#wechat_redirect`;
- }
- if (!!code && !wxCode) {
- try {
- userStore.setWxCode(router.params.code ?? '');
- let res = await getLifePayWxIndentity();
- userStore.setWxOpenId(res.openId);
- } catch (error) {}
- }
+ const { getLifePayWxIndentity } = useLifePayWxIndentity();
- async function getLifePayWxIndentity() {
- try {
- let params: APIgetLifePayWxIndentityParams = {
- code: code,
- };
- let res = await blLifeRecharge.services.getLifePayWxIndentity(params, {
- showLoading: false,
- });
- return res;
- } catch (error) {}
- }
+ Taro.useReady(async () => {
+ try {
+ //@ts-ignore
+ if (!code && isInWeChat && !wxCode.value && location?.replace) {
+ location.replace(
+ `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf940ff1d35a98493&redirect_uri=${location.href}&response_type=code&scope=snsapi_base#wechat_redirect`
+ );
+ }
+ if (!!code && !wxCode.value) {
+ userStore.setWxCode(router.params.code ?? '');
+ getLifePayWxIndentity(code);
+ }
+ } catch (error) {}
});
+}
+
+let wxIndentityPromise: Promise<WxMiniAppIndentityInfo>;
+
+export function useLifePayWxIndentity() {
+ const { blLifeRecharge } = useLifeRechargeContext();
+ const userStore = useUserStore();
+
+ async function getLifePayWxIndentity(code: string) {
+ try {
+ let params: APIgetLifePayWxIndentityParams = {
+ code: code,
+ };
+ if (!wxIndentityPromise) {
+ wxIndentityPromise = blLifeRecharge.services
+ .getLifePayWxIndentity(params, {
+ showLoading: false,
+ })
+ .finally(() => {
+ wxIndentityPromise = undefined;
+ });
+ }
+
+ let res = await wxIndentityPromise;
+ if (res.openId) {
+ userStore.setWxOpenId(res.openId);
+ }
+ return res;
+ } catch (error) {}
+ }
+
+ return { getLifePayWxIndentity };
+}
+
+export function useEnsureOpenId() {
+ const { wxCode, wxOpenId } = useUser();
+ const { getLifePayWxIndentity } = useLifePayWxIndentity();
+
+ async function ensureOpenId(): Promise<string> {
+ if (wxOpenId.value) {
+ return wxOpenId.value;
+ } else {
+ let rea = await getLifePayWxIndentity(wxCode.value);
+ return rea.openId ? rea.openId : await ensureOpenId();
+ }
+ }
+
+ return { ensureOpenId };
}
export function useGoLogin() {
const router = Taro.useRouter();
const { redirectParams } = useLoginedJump();
function goLoginFn() {
- // Taro.navigateTo({
+ // RouteHelper.navigateTo({
// url: `${RouterPath.authorization}?redirect=${router.path}&${object2query(router.params)}`,
// });
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.loginByForm}?redirect=${redirectParams.value}&tab=${LoginFormTabs.VerificationCodeLogin}`,
});
}
--
Gitblit v1.9.1