From 779ea5cbc6b222ea04cfe6573704d9c86d81bfe4 Mon Sep 17 00:00:00 2001
From: lyt-Top <1105290566@qq.com>
Date: Sun, 18 Apr 2021 20:05:58 +0800
Subject: [PATCH] =?UTF-8?q?'admin-21.04.18:=E6=9B=B4=E6=96=B0=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E4=BE=9D=E8=B5=96=E3=80=81=E4=BC=98=E5=8C=96=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E6=9D=A1=E9=97=AE=E9=A2=98'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json        | 10 +++++-----
 src/router/index.js |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index b5d1514..0512f51 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"clipboard": "^2.0.8",
 		"core-js": "^3.10.1",
 		"countup.js": "^2.0.7",
-		"echarts": "^5.0.2",
+		"echarts": "^5.1.0",
 		"element-ui": "^2.15.1",
 		"html2canvas": "^1.0.0-rc.7",
 		"json2csv": "^5.0.6",
@@ -36,10 +36,10 @@
 		"@vue/cli-plugin-vuex": "~4.5.12",
 		"@vue/cli-service": "~4.5.12",
 		"babel-eslint": "^10.1.0",
-		"eslint": "^7.23.0",
-		"eslint-plugin-vue": "^7.8.0",
-		"sass": "^1.32.8",
-		"sass-loader": "^8.0.2",
+		"eslint": "^7.24.0",
+		"eslint-plugin-vue": "^7.9.0",
+		"sass": "^1.32.10",
+		"sass-loader": "^10.1.1",
 		"vue-template-compiler": "^2.6.12"
 	}
 }
diff --git a/src/router/index.js b/src/router/index.js
index 75ce880..f0d8422 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -191,10 +191,10 @@ export function resetRouter() {
 // 路由加载前
 router.beforeEach((to, from, next) => {
 	NProgress.configure({ showSpinner: false });
-	NProgress.start();
+	if (to.meta.title) NProgress.start();
 	keepAliveSplice(to);
 	let token = getSession('token');
-	if (to.fullPath === '/login' && !token) {
+	if (to.path === '/login' && !token) {
 		next();
 		NProgress.done();
 	} else {
@@ -202,7 +202,7 @@ router.beforeEach((to, from, next) => {
 			next('/login');
 			clearSession();
 			NProgress.done();
-		} else if (token && to.fullPath === '/login') {
+		} else if (token && to.path === '/login') {
 			next('/home');
 			NProgress.done();
 		} else {