feat: 登录逻辑的调整

components/Interceptor/index.vue

@@ -1,18 +0,0 @@
-<template>
-  <button
-    v-if="!hasToken"
-    class="reset-btn"
-    open-type="getPhoneNumber"
-    @getphonenumber="onLogin"
-  />
-</template>
-
-<script setup>
-import { computed, defineEmits } from "vue";
-import { useAppStore } from "@/store";
-import { onLogin } from "@/hooks/useGoLogin";
-
-const emits = defineEmits(["click"]);
-
-const hasToken = computed(() => useAppStore().hasToken);
-</script>

hooks/useGoLogin.js

@@ -1,7 +1,7 @@
 import { loginAuth, bindPhone } from "@/manager/LoginManager";
-// 引入base.js中的clientId
+import { clientId } from "@/constant/base";
-      import { clientId } from "@/constant/base";
+import { useAppStore } from "@/store";
-      
+
 // 跳转登录
 export const goLogin = () => uni.navigateTo({ url: "/pages/login/index" });
 
@@ -14,7 +14,7 @@ export const onLogin = async (e) => {
     await loginAuth().then(async () => {
       const { code } = e.detail;
       console.info("onLogin code: ", code);
-      
+
       // 绑定手机号
       const params = { wechatPhoneCode: code, clientId: clientId };
       const res = await bindPhone(params);
@@ -26,14 +26,13 @@ export const onLogin = async (e) => {
 };
 
 // 检测token
-export const checkToken = async () => {
+export const checkToken = () => {
   return new Promise((resolve) => {
-    const token = uni.getStorageSync("token");
+    const appStore = useAppStore();
-    if (!token) {
+    console.log("appStore.hasToken: ", appStore.hasToken);
-      console.log("token不存在，重新登录");
+    if (!appStore.hasToken) {
-      loginAuth().then(() => {
+      console.log("没有token，跳转到登录页");
-        resolve();
+      goLogin();
-      });
       return;
     }
     resolve();

pages/chat/ChatMainList.vue

@@ -181,7 +181,7 @@ import {
 import WebSocketManager from "@/utils/WebSocketManager";
 import TypewriterManager from "@/utils/TypewriterManager";
 import { IdUtils } from "@/utils";
-import { goLogin } from "@/hooks/useGoLogin";
+import { goLogin, checkToken } from "@/hooks/useGoLogin";
 
 import { useAppStore } from "@/store";
 const appStore = useAppStore();
@@ -297,12 +297,9 @@ const handleReply = (text) => {
 };
 
 // 是发送指令
-const handleReplyInstruct = (item) => {
+const handleReplyInstruct = async (item) => {
-  if (!appStore.hasToken) {
+  await checkToken();
-    console.log("没有token，跳转到登录页");
+
-    goLogin();
-    return;
-  }
   if (item.type === "MyOrder") {
     // 订单
     uni.navigateTo({
@@ -632,14 +629,10 @@ const initData = () => {
 };
 
 // 发送消息的参数拼接
-const sendMessage = (message, isInstruct = false) => {
+const sendMessage = async (message, isInstruct = false) => {
   console.log("发送的消息：", message);
 
-  if (!appStore.hasToken) {
+  await checkToken();
-    console.log("没有token，跳转到登录页");
-    goLogin();
-    return;
-  }
 
   if (!webSocketConnectStatus) {
     uni.showToast({

pages/chat/ChatTopNavBar.vue

@@ -13,18 +13,12 @@
 <script setup>
 import { ref } from "vue";
 import DrawerHome from "@/pages/drawer/DrawerHome.vue";
-import { goLogin } from "@/hooks/useGoLogin";
+import { checkToken } from "@/hooks/useGoLogin";
-import { useAppStore } from "@/store";
-const appStore = useAppStore();
 const showLeft = ref(false);
 
 // 打开窗口
-const showDrawer = (e) => {
+const showDrawer = async (e) => {
-  if (!appStore.hasToken) {
+  await checkToken();
-    console.log("没有token，跳转到登录页");
-    goLogin();
-    return;
-  }
 
   showLeft.value.open();
   // 发送抽屉显示事件

pages/module/booking/QuickBookingContentList.vue

@@ -47,6 +47,7 @@
 <script setup>
 import ModuleTitle from "@/components/ModuleTitle/index.vue";
 import { defineProps } from "vue";
+import { checkToken } from "@/hooks/useGoLogin";
 
 const props = defineProps({
   commodityDTO: {
@@ -57,8 +58,10 @@ const props = defineProps({
 
 /// 去下单
 const placeOrderHandle = (item) => {
-  uni.navigateTo({
+  checkToken().then(() => {
-    url: `/pages/goods/index?commodityId=${item.commodityId}`,
+    uni.navigateTo({
+      url: `/pages/goods/index?commodityId=${item.commodityId}`,
+    });
   });
 };
 </script>

request/base/request.js

@@ -1,6 +1,5 @@
 import { goLogin } from "../../hooks/useGoLogin";
 import { BASE_URL } from "./baseUrl";
-import { loginAuth, checkPhone } from "@/manager/LoginManager";
 
 const defaultConfig = {
   header: {
@@ -53,13 +52,7 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
         resolve(res.data);
         if (res.statusCode && res.statusCode === 424) {
           console.log("424错误，重新登录");
-          loginAuth().then(async () => {
+          goLogin();
-            // 检测是否绑定手机号
-            const res = await checkPhone();
-            if (!res.data) {
-              goLogin();
-            }
-          });
         }
       },
       fail: (err) => {