From 6745e36a7933542b8a5658c9c59aca23572de7a9 Mon Sep 17 00:00:00 2001 From: duanshuwen Date: Sat, 27 Dec 2025 23:20:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91?= =?UTF-8?q?=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 | 8 +++++--- src/pages/login/index.vue | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hooks/useGoLogin.js b/src/hooks/useGoLogin.js index 996c4d6..8832771 100644 --- a/src/hooks/useGoLogin.js +++ b/src/hooks/useGoLogin.js @@ -62,7 +62,7 @@ export const checkToken = () => { }; // 刷新token -export const refreshToken = () => { +export const refreshToken = (needLogin = false) => { return new Promise(async (resolve) => { uni.login({ provider: "weixin", //使用微信登录 @@ -78,14 +78,16 @@ export const refreshToken = () => { const response = await wxLogin(params); + if (needLogin && response.access_token) { + setAccessToken(response.access_token); + } + if (response.access_token) { const checkRes = await checkUserPhone({ token: response.access_token, }); if (checkRes.data) { - setAccessToken(response.access_token); - // 登录成功后,触发登录成功事件 uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS); resolve(false); diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 8d686c4..33f4cf9 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -45,14 +45,12 @@ import { ref, computed } from "vue"; import { getServiceAgreement, getPrivacyAgreement, - checkUserPhone } from "@/request/api/LoginApi"; import { onLogin, goBack, refreshToken } from "@/hooks/useGoLogin"; import CheckBox from "@/components/CheckBox/index.vue"; import AgreePopup from "./components/AgreePopup/index.vue"; import { zniconsMap } from "@/static/fonts/znicons"; import { getCurrentConfig } from "@/constant/base"; -import { getAccessToken } from "@/constant/token"; const needWxLogin = ref(false); const isAgree = ref(false); @@ -78,7 +76,7 @@ const handleAgreeAndGetPhone = () => { return; } - refreshToken().then(() => goBack()); + refreshToken(true).then(() => goBack()); }; const getPhoneNumber = (e) => {