From c94a94d9d8dcf9aa892cd09dba22498e11b4e459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 5 Dec 2021 08:37:25 +0800
Subject: [PATCH] v3.7.0

---
 ZR.Vue/.jsbeautifyrc     | 12 ++++++++++++
 ZR.Vue/src/permission.js | 16 +++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 ZR.Vue/.jsbeautifyrc

diff --git a/ZR.Vue/.jsbeautifyrc b/ZR.Vue/.jsbeautifyrc
new file mode 100644
index 0000000..d79fae6
--- /dev/null
+++ b/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
+  }
+}
\ No newline at end of file
diff --git a/ZR.Vue/src/permission.js b/ZR.Vue/src/permission.js
index 25a17f0..924803a 100644
--- a/ZR.Vue/src/permission.js
+++ b/ZR.Vue/src/permission.js
@@ -1,13 +1,9 @@
 import router from './router'
 import store from './store'
-import {
-  Message
-} from 'element-ui'
+import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import {
-  getToken
-} from '@/utils/auth'
+import { 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({
-        path: '/'
-      })
+      next({ 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()
-})
+})
\ No newline at end of file