From 8bb9173a95a87e3ceab4f48b5b34041af38b7c70 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期五, 28 三月 2025 15:23:14 +0800 Subject: [PATCH] fix: 四期需求 --- apps/taro/src/hooks/user.ts | 61 +++++++++++++++++++++++++++--- 1 files changed, 54 insertions(+), 7 deletions(-) diff --git a/apps/taro/src/hooks/user.ts b/apps/taro/src/hooks/user.ts index 6e25fee..36ec443 100644 --- a/apps/taro/src/hooks/user.ts +++ b/apps/taro/src/hooks/user.ts @@ -6,8 +6,36 @@ 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,11 @@ return userStore.getCurrentUserInfo(); } + const { blLifeRecharge } = useLifeRechargeContext(); + const { virtualUserInfo } = useVirtualUserInfo(); + + const isChannelAccount = computed(() => virtualUserInfo.value.isBackClientUser); + return { user: userInfo, userDetail: userDetail, @@ -35,6 +68,8 @@ virtualPhoneNumber, wxCode, wxOpenId, + isChannelAccount, + virtualUserInfo, }; } @@ -101,6 +136,8 @@ }); } +let wxIndentityPromise: Promise<WxMiniAppIndentityInfo>; + export function useLifePayWxIndentity() { const { blLifeRecharge } = useLifeRechargeContext(); const userStore = useUserStore(); @@ -110,10 +147,20 @@ let params: APIgetLifePayWxIndentityParams = { code: code, }; - let res = await blLifeRecharge.services.getLifePayWxIndentity(params, { - showLoading: false, - }); - userStore.setWxOpenId(res.openId); + 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) {} } @@ -126,11 +173,11 @@ const { getLifePayWxIndentity } = useLifePayWxIndentity(); async function ensureOpenId() { - if (wxOpenId) { + if (wxOpenId.value) { return wxOpenId.value; } else { let rea = await getLifePayWxIndentity(wxCode.value); - return rea.openId; + return rea.openId ? rea.openId : wxOpenId.value; } } -- Gitblit v1.9.1