From 2c0d4143e3a3de21bddb5c8383513cc052c6a9dd Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期一, 24 三月 2025 19:53:19 +0800 Subject: [PATCH] fix: 三期bug --- apps/taro/src/hooks/user.ts | 103 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 97 insertions(+), 6 deletions(-) diff --git a/apps/taro/src/hooks/user.ts b/apps/taro/src/hooks/user.ts index f1308ee..26d5535 100644 --- a/apps/taro/src/hooks/user.ts +++ b/apps/taro/src/hooks/user.ts @@ -1,18 +1,30 @@ 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, + WxMiniAppIndentityInfo, +} from '@life-payment/core-vue'; +import { isInWeChat } from '@/utils/env'; export function useUser() { const userStore = useUserStore(); - const { userDetail, userInfo, locationCity, virtualUserId, virtualPhoneNumber } = - storeToRefs(userStore); + const { + userDetail, + userInfo, + locationCity, + virtualUserId, + virtualPhoneNumber, + wxCode, + wxOpenId, + } = storeToRefs(userStore); function updateUserInfo() { return userStore.getCurrentUserInfo(); @@ -25,6 +37,8 @@ locationCity, virtualUserId, virtualPhoneNumber, + wxCode, + wxOpenId, }; } @@ -47,13 +61,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)}`, }); } @@ -62,15 +77,91 @@ return { isAuth }; } +export function useInitWeixinJSBridge() { + const { wxCode } = useUser(); + + const userStore = useUserStore(); + const router = Taro.useRouter(); + + const code = router.params.code ?? ''; + + const { blLifeRecharge } = useLifeRechargeContext(); + + const { getLifePayWxIndentity } = useLifePayWxIndentity(); + + 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() { + if (wxOpenId.value) { + return wxOpenId.value; + } else { + let rea = await getLifePayWxIndentity(wxCode.value); + return rea.openId ? rea.openId : wxOpenId.value; + } + } + + 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