联调接口

src/utils/cache.js

@@ -26,10 +26,10 @@ const cache = {
                 return null
             }
             const { value, expire } = JSON.parse(data)
-            if (expire && expire < this.time()) {
-                uni.removeStorageSync(key)
-                return null
-            }
+            // if (expire && expire < this.time()) {
+            //     uni.removeStorageSync(key)
+            //     return null
+            // }
             return value
         } catch (e) {
             return null

src/utils/common.js

@@ -0,0 +1,12 @@
+// 递归算法
+export const initTree = (arr, parentId='0',id) => {
+    const tree = [];
+    arr.filter(item => item.parentId === parentId).forEach(item => {
+      const children = initTree(arr, item[id]);
+      if (children.length > 0) {
+        item.children = children;
+      }
+      tree.push(item);
+    });
+    return tree;
+}

src/utils/request/index.js

@@ -3,16 +3,14 @@ import { merge } from 'lodash-es';
 import { getToken } from '../auth';
 import { CLIENT_ID } from '@/enums/cacheEnums';
 import { RequestCodeEnum, RequestMethodsEnum } from '@/enums/requestEnums';
+import { clearToken } from '@/utils/auth'
 import { useUserStore } from '@/stores/user'
 import { useMessage } from '../message';
-
 const message = useMessage();
 
 const requestHooks = {
     // 请求拦截器
     requestInterceptorsHook(options, config) {
-        console.log("request=>",options);
-        // console.log("request=>config=>",config)
         const { urlPrefix, baseUrl, withToken, isAuth } = config;
         options.header = options.header ?? {};
         if (urlPrefix) {
@@ -22,9 +20,11 @@ const requestHooks = {
             options.url = `${baseUrl}${options.url}`;
         }
         const token = getToken(); //console.log("token=>",token)
-        if (withToken && !options.header.token) {
-            options.header.token = token;
-        }
+        // if (withToken && !options.header.token) {
+            options.header.token = "Bearer "+ token;
+            options.header.Authorization = "Bearer "+ token;
+        // }
+        console.log("request=>",options)
         return options;
     },
     // 响应拦截器
@@ -39,7 +39,7 @@ const requestHooks = {
         if (!isTransformResponse) {
             return response.data;
         }
-        const { logout, isLogin } = useUserStore();
+        // const { logout, isLogin } = useUserStore();
         const { code, data, msg, show } = response.data;
         // console.log(code,data,msg,show)
         switch (code) {
@@ -50,9 +50,12 @@ const requestHooks = {
                 message.toast(msg);
                 return Promise.reject(msg);
             case RequestCodeEnum.TOKEN_INVALID:
-                if (isAuth && isLogin) {
-                    
-                }
+                message.toast('登录状态已过期，请重新登录！');
+                // console.log(isAuth,isLogin)
+                // if (isAuth && isLogin) {
+					clearToken();
+					uni.reLaunch({ url: '/pages/login/login' })
+                // }
                 
                 return Promise.reject();