修复没有token的时候

kuangshp · kuangshp · commit bbfc8a48c6f6 · 2020-07-02T15:57:40.000+08:00
diff --git a/menu-data.js b/menu-data.js
@@ -0,0 +1,36 @@
+module.exports = [
+  {
+    id: 0,
+    icon: 'el-icon-s-order',
+    index: 'table',
+    title: '基础表格',
+    pid: -1,
+  },
+  {
+    id: 1,
+    icon: 'el-icon-s-marketing',
+    index: 'tab',
+    title: 'tab选项卡',
+    pid: -1,
+  },
+  {
+    id: 2,
+    icon: 'el-icon-folder-opened',
+    index: 'form',
+    title: '表单相关',
+    pid: -1,
+  },
+  {
+    id: 3,
+    index: 'base_form',
+    title: '基本表单',
+    icon: 'el-icon-s-data',
+    pid: 2,
+  },
+  {
+    id: 4,
+    index: 'upload',
+    title: '文件上传',
+    pid: 2,
+  }
+];
diff --git a/src/router/router.js b/src/router/router.js
@@ -56,14 +56,21 @@ const auth = (to, from, next) => {
  * @param {type} 
  * @return: 
  */
+const whiteList = ['login'];
 const authRoutes = async (to, from, next) => {
-  const routes = await store.dispatch('getMenuListApi');
-  const routesUrlList = routes.map(item => item.index);
-  if (routesUrlList.includes(to.name)) {
-    next({ ...to, replace: true });
+  if (storage.getItem(authToken)) {
+    const routes = await store.dispatch('getMenuListApi');
+    const routesUrlList = routes.map(item => item.index);
+    if (routesUrlList.includes(to.name) || whiteList.includes(to.name)) {
+      next({ ...to, replace: true });
+      return
+    } else {
+      next({ name: 'home', replace: true });
+    }
   } else {
-    next({ name: 'home', replace: true });
+    // next({name: '/login'});
   }
+  
 }
 /********************************路由拦截配置 start********************************/
 router.beforeEach((to, from, next) => {
diff --git a/src/services/menu.js b/src/services/menu.js
@@ -3,7 +3,7 @@ import axios from 'axios';
 class MenuService {
   // 获取菜单的接口
   async getMenuList () {
-    return await axios.get('http://localhost:3000/category');
+    return await axios.get('http://localhost:9000/api/category');
   }
 }
 
diff --git a/src/store/modules/menus.js b/src/store/modules/menus.js
@@ -12,9 +12,9 @@ export default {
   actions: {
     // 获取菜单的api
     async getMenuListApi ({ commit }) {
-      const { menuList } = await MenuService.getMenuList();
-      commit('setAuthMenuList', menuList);
-      return menuList;
+      const { data } = await MenuService.getMenuList();
+      commit('setAuthMenuList', data);
+      return data;
     },
   }
 }
diff --git a/vue.config.js b/vue.config.js
@@ -1,4 +1,5 @@
 const path = require("path");
+const menus = require('./menu-data');
 
 module.exports = {
   configureWebpack: {
@@ -13,5 +14,13 @@ module.exports = {
     port: 9000,
     open: false,
     disableHostCheck: true,
+    before(app) {
+      app.get('/api/category', (req, res) => {
+        res.json({
+          code: 0,
+          data: menus,
+        })
+      })
+    }
   },
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import axios from 'axios';`
`3`	`3`	`class MenuService {`
`4`	`4`	`// 获取菜单的接口`
`5`	`5`	`async getMenuList () {`
`6`		`- return await axios.get('http://localhost:3000/category');`
	`6`	`+ return await axios.get('http://localhost:9000/api/category');`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ export default {`
`12`	`12`	`actions: {`
`13`	`13`	`// 获取菜单的api`
`14`	`14`	`async getMenuListApi ({ commit }) {`
`15`		`- const { menuList } = await MenuService.getMenuList();`
`16`		`- commit('setAuthMenuList', menuList);`
`17`		`- return menuList;`
	`15`	`+ const { data } = await MenuService.getMenuList();`
	`16`	`+ commit('setAuthMenuList', data);`
	`17`	`+ return data;`
`18`	`18`	`},`
`19`	`19`	`}`
`20`	`20`	`}`