feat: 登录逻辑调整

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);

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) => {