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/hooks/user.ts | 71 +++++++++++++++++++++++++++++++---- 1 files changed, 63 insertions(+), 8 deletions(-) diff --git a/apps/taro/src/hooks/user.ts b/apps/taro/src/hooks/user.ts index 7373103..3dd00bb 100644 --- a/apps/taro/src/hooks/user.ts +++ b/apps/taro/src/hooks/user.ts @@ -5,11 +5,22 @@ 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'; export function useUser() { const userStore = useUserStore(); - const { userDetail, userInfo, locationCity } = storeToRefs(userStore); + const { + userDetail, + userInfo, + locationCity, + virtualUserId, + virtualPhoneNumber, + wxCode, + wxOpenId, + } = storeToRefs(userStore); function updateUserInfo() { return userStore.getCurrentUserInfo(); @@ -20,13 +31,17 @@ userDetail: userDetail, updateUserInfo, locationCity, + virtualUserId, + virtualPhoneNumber, + wxCode, + wxOpenId, }; } export function useIsLogin() { - const { user, userDetail } = useUser(); - return computed(() => !!user.value); - // return user?.isPersonal ? !!user : !!user && !!enterpriseInfo; + const { virtualUserId } = useUser(); + // return computed(() => !!user.value); + return computed(() => !!virtualUserId.value); } type UseAuthOptions = { @@ -45,11 +60,11 @@ Taro.useReady(async () => { if (isLogin.value && userStore.firstGetUserDetail) { - userStore.getCurrentUserInfo(); + // userStore.getCurrentUserInfo(); } if (needAuth && !isLogin.value) { Taro.navigateTo({ - url: `${RouterPath.authorization}?redirect=${router.path}&${object2query(router.params)}`, + url: `${RouterPath.loginByForm}?redirect=${router.path}&${object2query(router.params)}`, }); } }); @@ -57,12 +72,52 @@ return { isAuth }; } -export function useGoLogin() { +export function useInitWeixinJSBridge() { + const { wxCode } = useUser(); + + const userStore = useUserStore(); const router = Taro.useRouter(); + const code = router.params.code ?? ''; + + 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) {} + } + + async function getLifePayWxIndentity() { + try { + let params: APIgetLifePayWxIndentityParams = { + code: code, + }; + let res = await blLifeRecharge.services.getLifePayWxIndentity(params, { + showLoading: false, + }); + return res; + } catch (error) {} + } + }); +} + +export function useGoLogin() { + const router = Taro.useRouter(); + const { redirectParams } = useLoginedJump(); function goLoginFn() { + // Taro.navigateTo({ + // url: `${RouterPath.authorization}?redirect=${router.path}&${object2query(router.params)}`, + // }); + Taro.navigateTo({ - url: `${RouterPath.authorization}?redirect=${router.path}&${object2query(router.params)}`, + url: `${RouterPath.loginByForm}?redirect=${redirectParams.value}&tab=${LoginFormTabs.VerificationCodeLogin}`, }); } -- Gitblit v1.9.1