Merge branch 'master' of http://gitlab.91isoft.com:90/zhangbotao/nlt-e-cigarette

src/permission.js

@@ -31,7 +31,6 @@ router.beforeEach((to, from, next) => {
             // const roles = res.data.roles
             store.dispatch('GenerateRoutes', res).then((routers) => {
               // 判断用户是否有路由
-              console.log('判断用户是否有路由', routers)
               if (routers.accessedRoutes && routers.accessedRoutes.length > 0 && routers.getRouters && routers.getRouters.length > 0) {
                 // 测试 默认静态页面
                 // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => {
@@ -49,6 +48,7 @@ router.beforeEach((to, from, next) => {
                     })
                   }
                 })
+                console.log('routers', routers)
                 router.addRoutes(routers.accessedRoutes) // 动态添加可访问路由表
                 next({ path: routers.accessedRoutes[0].children[0].path, replace: true }) // 没有首页，自动切换跳转到下一级
                 // next({ ...to, replace: true }) // hack方法 确保addRoutes已完成