From 4cb3259a2dc953678d6d7b3961728b0e47f32fc4 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 24 二月 2025 15:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront
---
apps/taro/src/hooks/user.ts | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/apps/taro/src/hooks/user.ts b/apps/taro/src/hooks/user.ts
index 7373103..f1308ee 100644
--- a/apps/taro/src/hooks/user.ts
+++ b/apps/taro/src/hooks/user.ts
@@ -5,11 +5,14 @@
import { useQuery } from '@tanstack/vue-query';
import { MaybeRef } from 'vue';
import { useRefeshDidShow } from './infiniteLoading';
+import { LoginFormTabs } from '@/subpackages/login/constants';
+import { useLoginedJump } from './login';
export function useUser() {
const userStore = useUserStore();
- const { userDetail, userInfo, locationCity } = storeToRefs(userStore);
+ const { userDetail, userInfo, locationCity, virtualUserId, virtualPhoneNumber } =
+ storeToRefs(userStore);
function updateUserInfo() {
return userStore.getCurrentUserInfo();
@@ -20,13 +23,15 @@
userDetail: userDetail,
updateUserInfo,
locationCity,
+ virtualUserId,
+ virtualPhoneNumber,
};
}
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 +50,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)}`,
});
}
});
@@ -59,10 +64,14 @@
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