权限页面优化

PanJiaChen · PanJiaChen · commit 0476f25ebada · 2017-05-16T10:44:55.000+08:00
diff --git a/src/main.js b/src/main.js
@@ -52,13 +52,13 @@ router.beforeEach((to, from, next) => {
       next({ path: '/' });
     } else {
       if (to.meta && to.meta.role) { // 判断即将进入的页面是否需要权限
-        if (store.getters.uid) { // 判断当前用户是否已拉去玩info信息
+        if (store.getters.uid) { // 判断当前用户是否已拉取完info信息
           if (hasPermission(store.getters.roles, to.meta.role)) { // 判断权限
             next(); // 有权限
           } else {
-            next('/401'); // 无权限
+            next({ path: '/401', query: { noGoBack: true } }); // 无权限
           }
-        } else { // 未拉去info信息
+        } else { // 未拉取info信息
           store.dispatch('GetInfo').then(() => { // 拉取info
             permission.init({ // 初始化权限
               roles: store.getters.roles,
@@ -67,7 +67,7 @@ router.beforeEach((to, from, next) => {
             if (hasPermission(store.getters.roles, to.meta.role)) { // 判断权限
               next();// 有权限
             } else {
-              next('/401');// 无权限
+              next({ path: '/401', query: { noGoBack: true } }); // 无权限
             }
           }).catch(err => {
             console.log(err);
diff --git a/src/utils/fetch.js b/src/utils/fetch.js
@@ -21,10 +21,7 @@ service.interceptors.request.use(config => {
 })
 
 service.interceptors.response.use(
-  response => {
-    console.log(response)
-    return response;
-  },
+  response => response,
   error => {
     console.log('err' + error);// for debug
     const code = error.response.data;
diff --git a/src/views/error/401.vue b/src/views/error/401.vue
@@ -39,7 +39,11 @@
       },
       methods: {
         back() {
-          this.$router.go(-1)
+          if (this.$route.query.noGoBack) {
+            this.$router.push({ path: '/dashboard' });
+          } else {
+            this.$router.go(-1);
+          }
         }
       }
     };

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,11 @@`
`39`	`39`	`},`
`40`	`40`	`methods: {`
`41`	`41`	`back() {`
`42`		`- this.$router.go(-1)`
	`42`	`+ if (this.$route.query.noGoBack) {`
	`43`	`+ this.$router.push({ path: '/dashboard' });`
	`44`	`+ } else {`
	`45`	`+ this.$router.go(-1);`
	`46`	`+ }`
`43`	`47`	`}`
`44`	`48`	`}`
`45`	`49`	`};`