From dfadb069346389377946d2f4db8881cb111ab928 Mon Sep 17 00:00:00 2001 From: duanshuwen Date: Thu, 25 Dec 2025 23:04:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useGoLogin.js | 59 +++++++++++++++++++++---------------- src/manager/LoginManager.js | 1 - 2 files changed, 33 insertions(+), 27 deletions(-) diff --git a/src/hooks/useGoLogin.js b/src/hooks/useGoLogin.js index 42265e3..452319d 100644 --- a/src/hooks/useGoLogin.js +++ b/src/hooks/useGoLogin.js @@ -61,34 +61,41 @@ export const checkToken = () => { }; // 刷新token -export const refreshToken = async () => { - return new Promise((resolve) => { - checkPhone().then(async (checkRes) => { - if (!checkRes.data) { - resolve(true); - return; - } +export const refreshToken = () => { + return new Promise(async (resolve) => { + const token = getStorageSyncToken(); - uni.login({ - provider: "weixin", //使用微信登录 - success: async ({ code }) => { - console.log("refreshToken", code); - const params = { - openIdCode: [code], - grant_type: "wechat", - scope: "server", - clientId: clientId, - }; - console.log("获取到的微信授权params:", JSON.stringify(params)); - const response = await wxLogin(params); + if (!token) { + resolve(true); + return; + } - if (response.access_token) { - setStorageSyncToken(response.access_token); - // 登录成功后,触发登录成功事件 - uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS); - } - }, - }); + const checkRes = await checkPhone(); + + if (!checkRes.data) { + resolve(true); + return; + } + + uni.login({ + provider: "weixin", //使用微信登录 + success: async ({ code }) => { + console.log("refreshToken", code); + const params = { + openIdCode: [code], + grant_type: "wechat", + scope: "server", + clientId: clientId, + }; + console.log("获取到的微信授权params:", JSON.stringify(params)); + const response = await wxLogin(params); + + if (response.access_token) { + setStorageSyncToken(response.access_token); + // 登录成功后,触发登录成功事件 + uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS); + } + }, }); }); }; diff --git a/src/manager/LoginManager.js b/src/manager/LoginManager.js index f8fda60..289dffb 100644 --- a/src/manager/LoginManager.js +++ b/src/manager/LoginManager.js @@ -11,7 +11,6 @@ import { removeStorageSyncToken, setStorageSyncToken } from "../constant/token"; const loginAuth = (e) => { removeStorageSyncToken(); - const appStore = useAppStore(); return new Promise(async (resolve, reject) => { const openIdCode = await getWeChatAuthCode(e);