From 3633cf70a3d835da15d27a91e7f8f8fd15dbcb35 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 20 三月 2025 10:59:21 +0800
Subject: [PATCH] fix: 三期需求
---
apps/taro/src/hooks/user.ts | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/apps/taro/src/hooks/user.ts b/apps/taro/src/hooks/user.ts
index e651456..f76e73d 100644
--- a/apps/taro/src/hooks/user.ts
+++ b/apps/taro/src/hooks/user.ts
@@ -1,7 +1,6 @@
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';
@@ -58,7 +57,6 @@
const isAuth = computed(() => !needAuth || isLogin.value);
const router = Taro.useRouter();
- console.log('222', 222);
useInitWeixinJSBridge();
Taro.useReady(async () => {
@@ -66,7 +64,7 @@
// userStore.getCurrentUserInfo();
}
if (needAuth && !isLogin.value) {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.loginByForm}?redirect=${router.path}&${object2query(router.params)}`,
});
}
@@ -88,8 +86,10 @@
Taro.useReady(async () => {
try {
//@ts-ignore
- if (!code && isInWeChat && !wxCode.value) {
- 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 && 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 ?? '');
@@ -116,11 +116,11 @@
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