From bed5e8d840af411c45d6a44dbe0db22e360e0d34 Mon Sep 17 00:00:00 2001
From: lyt <1105290566@qq.com>
Date: Wed, 2 Jun 2021 17:32:55 +0800
Subject: [PATCH] =?UTF-8?q?'admin-21.06.02:=E4=BC=98=E5=8C=96=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E3=80=81=E6=9B=B4=E6=96=B0=E6=9C=80=E6=96=B0=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md        |  7 +++++++
 package.json        |  6 +++---
 src/router/index.js | 12 ++++++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71ae170..c83f9b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 🎉🎉🔥 `vue-prev-admin` 基于 vue2.x + webpack + element ui，适配手机、平板、pc 的后台开源免费模板库（vue3.x 请切换 master 分支）
 
+## 1.0.3
+
+`2021.06.01`
+
+- 🌟 更新 依赖更新最新版本
+- 💯 优化 动态加载后端返回路由路由(模拟数据)方法
+
 ## 1.0.2
 
 `2021.06.01`
diff --git a/package.json b/package.json
index bfd3b80..ebb2371 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vue-prev-admin",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"private": true,
 	"scripts": {
 		"dev": "vue-cli-service serve",
@@ -18,7 +18,7 @@
 		"nprogress": "^0.2.0",
 		"screenfull": "^5.1.0",
 		"sign-canvas": "^1.1.4",
-		"vue": "^2.6.12",
+		"vue": "^2.6.13",
 		"vue-i18n": "^8.24.4",
 		"vue-particles": "^1.0.9",
 		"vue-router": "^3.5.1",
@@ -37,6 +37,6 @@
 		"eslint-plugin-vue": "^7.10.0",
 		"sass": "^1.34.0",
 		"sass-loader": "^10.1.1",
-		"vue-template-compiler": "^2.6.12"
+		"vue-template-compiler": "^2.6.13"
 	}
 }
diff --git a/src/router/index.js b/src/router/index.js
index be44858..3bd55b3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -194,6 +194,13 @@ export function delayNProgressDone(time = 300) {
 	}, time);
 }
 
+// 动态加载后端返回路由路由(模拟数据)
+export function getRouterList(router, to, next) {
+	if (!getSession('userInfo')) return false;
+	if (getSession('userInfo').userName === 'admin') adminUser(router, to, next);
+	else if (getSession('userInfo').userName === 'test') testUser(router, to, next);
+}
+
 // 路由加载前
 router.beforeEach((to, from, next) => {
 	keepAliveSplice(to);
@@ -211,11 +218,8 @@ router.beforeEach((to, from, next) => {
 			clearSession();
 			delayNProgressDone();
 		} else {
-			// 动态加载后端返回路由路由(模拟数据)
-			if (!getSession('userInfo')) return false;
 			if (Object.keys(store.state.routesList.routesList).length <= 0) {
-				if (getSession('userInfo').userName === 'admin') adminUser(router, to, next);
-				else if (getSession('userInfo').userName === 'test') testUser(router, to, next);
+				getRouterList(router, to, next);
 			} else {
 				next();
 				delayNProgressDone(0);