Browse Source

提交代码

Lijy 1 year ago
parent
commit
daa9d85c45

+ 3 - 2
fhKeeper/formulahousekeeper/customerBuler-crm/src/router/index.ts

@@ -48,9 +48,10 @@ router.beforeEach((to, _from, next) => {
   const routerList = useStore().routers;
   const routers = router.getRoutes();
   console.log(routerList, routers);
-  const { setAsyncRoutesMark, asyncRoutesMark } = useStore();
-  const token = true;
+  const { setAsyncRoutesMark, asyncRoutesMark, getToken } = useStore();
+  const token = getToken;
   const skipPath = ["/login", "/register", "/test", "/testEcharts"];
+  console.log(token, '<==== token')
   if (skipPath.includes(to.path)) {
     next();
   } else {

+ 8 - 6
fhKeeper/formulahousekeeper/customerBuler-crm/src/store/index.ts

@@ -1,17 +1,19 @@
 import { defineStore, acceptHMRUpdate } from "pinia";
 import { RouteRecordRaw } from "vue-router";
 export const useStore = defineStore({
-  id: "index",
+  id: "storeInfo",
   state: () => ({
-    userInfo: {}, // 当前的用户信息
+    userInfo: { id: '' }, // 当前的用户信息
     routers: [], // 返回的所有路由
     asyncRoutesMark: false, // 是否添加过路由
   }),
   getters: {
-    // 取值
-    getRoutersList(): RouteRecordRaw[] {
+    getRoutersList(): RouteRecordRaw[] { // 取值
       return this.routers;
-    } 
+    },
+    getToken(): string {
+      return  this.userInfo?.id || ''
+    }
   },
   actions: {
     // 方法
@@ -27,7 +29,7 @@ export const useStore = defineStore({
     clearStore() {
       localStorage.clear();
       sessionStorage.clear();
-      this.userInfo = {};
+      this.userInfo = { id: '' };
       this.routers = [];
       this.asyncRoutesMark = false;
     }