v3.7.0

ZR.Vue/.jsbeautifyrc

@@ -0,0 +1,12 @@
+{
+  "brace_style": "none,preserve-inline",
+  "indent_size": 2,
+  "indent_char": " ",
+  "jslint_happy": true,
+  "unformatted": [
+    ""
+  ],
+  "css": {
+    "indent_size": 2
+  }
+}

ZR.Vue/src/permission.js

@@ -1,13 +1,9 @@
 import router from './router'
 import store from './store'
-import {
+import { Message } from 'element-ui'
-  Message
-} from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import {
+import { getToken } from '@/utils/auth'
-  getToken
-} from '@/utils/auth'
 
 NProgress.configure({
   showSpinner: false
@@ -22,9 +18,7 @@ router.beforeEach((to, from, next) => {
   if (getToken()) {
     /* has token*/
     if (to.path === '/login') {
-      next({
+      next({ path: '/' })
-        path: '/'
-      })
       NProgress.done()
     } else {
       if (store.getters.roles.length === 0) {
@@ -38,7 +32,7 @@ router.beforeEach((to, from, next) => {
         }).catch(err => {
           console.error(err)
           store.dispatch('LogOut').then(() => {
-						console.log('弹框登录失败')
+            console.log('弹框登录失败')
             Message.error(err != undefined ? err : '登录失败')
             next({ path: '/' })
           })
@@ -62,4 +56,4 @@ router.beforeEach((to, from, next) => {
 
 router.afterEach(() => {
   NProgress.done()
-})
+})