From 624af00ba3fcd0032859a5558e257b011bc60ec1 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Tue, 16 May 2017 18:20:47 +0800
Subject: [PATCH] refine code

---
 src/main.js             | 3 +--
 src/store/permission.js | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main.js b/src/main.js
index dd759e8d..c4224f2c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -70,7 +70,6 @@ router.beforeEach((to, from, next) => {
           });
         }
       } else { // 页面不需要权限 直接进入
-        console.log(store.getters.roles)
         if (store.getters.roles.length !== 0) {
           next();
         } else {
@@ -87,7 +86,7 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
-    if (whiteList.indexOf(to.path) !== -1) { // 在免登入白名单，直接进入
+    if (whiteList.indexOf(to.path) !== -1) { // 在免登录白名单，直接进入
       next()
     } else {
       next('/login'); // 否则全部重定向到登录页
diff --git a/src/store/permission.js b/src/store/permission.js
index 7e14b0d2..7972f2b4 100644
--- a/src/store/permission.js
+++ b/src/store/permission.js
@@ -3,8 +3,7 @@ const permission = {
     permissionRoutes: []
   },
   init(data) {
-    const roles = data.roles;
-    const router = data.router;
+    const { roles, router } = data;
     const permissionRoutes = router.filter(v => {
       if (roles.indexOf('admin') >= 0) return true;
       if (this.hasPermission(roles, v)) {
@@ -22,10 +21,10 @@ const permission = {
       }
       return false;
     });
-    this.permissionRoutes = permissionRoutes;
+    this.state.permissionRoutes = permissionRoutes;
   },
   get() {
-    return this.permissionRoutes
+    return this.state.permissionRoutes
   },
   hasPermission(roles, route) {
     if (route.meta && route.meta.role) {