6.13提交

src/store/permission.js

@@ -23,20 +23,18 @@ export const usePermissionStore = defineStore('permisson', {
 
       routeList.forEach((item) => {
         const route = {};
-        // if (item.visible == 0) {
-          if (item.menuType === 'M' || item.menuType === 'C') {
             route.path = item.path;
-            route.name = item.menuName;
-            if (item.menuType === 'M') {
+            route.name = item.menu_name;
+            if (item.parent_id==0) {
               route.component = modules[`../views/index.vue`];
-            } else if (item.menuType === 'C') {
+            } else{
               route.component = modules[`../views${item.component}.vue`] || modules['../views/error-page/888.vue'];
             }
             route.meta = {
               title: item.title,
               permission: item.permission,
             };
-          }
+         
 
           if (item.children) {
             route.children = this.GenerateRoutes(item.children);
@@ -44,7 +42,7 @@ export const usePermissionStore = defineStore('permisson', {
           routes.push(route);
         // }
       });
-
+    
       return routes;
     },
     async getMenuRole() {
@@ -52,6 +50,9 @@ export const usePermissionStore = defineStore('permisson', {
       console.log(res.data);
       this.setMenuList(res.data);
       this.addRouters = await this.GenerateRoutes(res.data);
+      console.log("--------this.addRouters");
+      console.log(this.addRouters);
+
     },
     ClearMenuList() {
       this.menuList = [];

src/store/userInfo.js

@@ -9,33 +9,40 @@ export const useUserStore = defineStore('user', {
       token: window.sessionStorage.getItem('token') || '',
       uid: window.sessionStorage.getItem('uid') || '',
       sysConfig: getLocalStorage('sysConfig'),
-      userInfo: '',
+      userInfo:window.sessionStorage.getItem('manage-userInfo')?JSON.parse(window.sessionStorage.getItem('manage-userInfo')):''
     }
   },
-  getters: {
-    roles: (state) => state.userInfo.roles || [],
-  },
+  // getters: {
+  //   roles: (state) => state.userInfo.roles || [],
+  // },
   actions: {
-    setToken(token) {
+    setInfo(token,user) {
       this.token = token;
-
+      this.userInfo=user;
       window.sessionStorage.setItem('token', token);
+      window.localStorage.setItem('uid',user.user_id);
+      window.sessionStorage.setItem('manage-userInfo',JSON.stringify(user));
     },
-    async getUserInfo() {
-      try {
-        const res = await getInfo();
-        // window.sessionStorage.setItem('uid', res.data.userId);
-        window.localStorage.setItem('uid', res.data.userId);
-        this.userInfo = res.data;
-      } catch (err) {
-        console.error(err);
-      }
-    },
+    // async getUserInfo() {
+    //   try {
+    //     const res = await getInfo();
+    //     // window.sessionStorage.setItem('uid', res.data.userId);
+    //     this.userInfo = res.data;
+       
+        
+
+    //   } catch (err) {
+    //     console.error(err);
+    //   }
+    // },
     async getSysConfig() {
       try {
         // const res = await getAppConfig();
         // setLocalStorage('sysConfig', res.data);
-         this.sysConfig ={sys_app_logo: "https://doc-image.zhangwj.com/img/go-admin.png", sys_app_name: "go-admin管理系统"} //res.data;
+        //res.data;
+        let data={sys_app_logo: "https://doc-image.zhangwj.com/img/go-admin.png", sys_app_name: "go-admin管理系统"};
+        setLocalStorage('sysConfig', data);
+         this.sysConfig =data
       } catch (err) {
         console.error(err);
       }