Sendya пре 5 година
родитељ
комит
fe89166df6
5 измењених фајлова са 15 додато и 9 уклоњено
  1. 5 5
      src/config/router.config.js
  2. 3 2
      src/mock/services/user.js
  3. 2 1
      src/permission.js
  4. 4 0
      src/store/index.js
  5. 1 1
      src/views/user/Login.vue

+ 5 - 5
src/config/router.config.js

@@ -232,31 +232,31 @@ export const asyncRouterMap = [
                 path: '/account/settings/base',
                 name: 'BaseSettings',
                 component: () => import('@/views/account/settings/BaseSetting'),
-                meta: { title: '基本设置', hidden: true, permission: [ 'user' ] }
+                meta: { title: '基本设置', permission: [ 'user' ] }
               },
               {
                 path: '/account/settings/security',
                 name: 'SecuritySettings',
                 component: () => import('@/views/account/settings/Security'),
-                meta: { title: '安全设置', hidden: true, keepAlive: true, permission: [ 'user' ] }
+                meta: { title: '安全设置', keepAlive: true, permission: [ 'user' ] }
               },
               {
                 path: '/account/settings/custom',
                 name: 'CustomSettings',
                 component: () => import('@/views/account/settings/Custom'),
-                meta: { title: '个性化设置', hidden: true, keepAlive: true, permission: [ 'user' ] }
+                meta: { title: '个性化设置', keepAlive: true, permission: [ 'user' ] }
               },
               {
                 path: '/account/settings/binding',
                 name: 'BindingSettings',
                 component: () => import('@/views/account/settings/Binding'),
-                meta: { title: '账户绑定', hidden: true, keepAlive: true, permission: [ 'user' ] }
+                meta: { title: '账户绑定', keepAlive: true, permission: [ 'user' ] }
               },
               {
                 path: '/account/settings/notification',
                 name: 'NotificationSettings',
                 component: () => import('@/views/account/settings/Notification'),
-                meta: { title: '新消息通知', hidden: true, keepAlive: true, permission: [ 'user' ] }
+                meta: { title: '新消息通知', keepAlive: true, permission: [ 'user' ] }
               }
             ]
           }

+ 3 - 2
src/mock/services/user.js

@@ -407,14 +407,15 @@ const userNav = (options) => {
       }
     },
     {
-      'name': 'analysis',
+      'name': 'Analysis',
       'parentId': 1,
       'id': 2,
       'meta': {
         'title': '分析页',
         'show': true
       },
-      'component': 'Analysis'
+      'component': 'Analysis',
+      'path': '/dashboard/analysis'
     },
     {
       'name': 'tests',

+ 2 - 1
src/permission.js

@@ -11,6 +11,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
 const whiteList = ['login', 'register', 'registerResult'] // no redirect whitelist
+const defaultRoutePath = '/dashboard/workplace'
 
 router.beforeEach((to, from, next) => {
   NProgress.start() // start progress bar
@@ -18,7 +19,7 @@ router.beforeEach((to, from, next) => {
   if (Vue.ls.get(ACCESS_TOKEN)) {
     /* has token */
     if (to.path === '/user/login') {
-      next({ path: '/dashboard/workplace' })
+      next({ path: defaultRoutePath })
       NProgress.done()
     } else {
       if (store.getters.roles.length === 0) {

+ 4 - 0
src/store/index.js

@@ -4,7 +4,11 @@ import Vuex from 'vuex'
 import app from './modules/app'
 import user from './modules/user'
 import i18n from './modules/i18n'
+
+// default router permission control
 import permission from './modules/permission'
+
+// dynamic router permission control (Experimental)
 // import permission from './modules/async-router'
 import getters from './getters'
 

+ 1 - 1
src/views/user/Login.vue

@@ -261,7 +261,7 @@ export default {
         })
       })
       */
-      this.$router.push({ name: 'analysis' })
+      this.$router.push({ name: 'Analysis' })
       // 延迟 1 秒显示欢迎信息
       setTimeout(() => {
         this.$notification.success({