From 4589ecb6e8e492cefdbd695ee97b5160de7305a2 Mon Sep 17 00:00:00 2001
From: lyt <1105290566@qq.com>
Date: Mon, 12 Dec 2022 15:06:28 +0800
Subject: [PATCH] =?UTF-8?q?'admin-22.12.12:=E5=8F=91=E5=B8=83v1.2.1?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=E5=85=B7=E4=BD=93=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=9F=A5=E7=9C=8BCHANGELOG.md'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                              |  7 +++++++
 jsconfig.json                             | 11 +++++++++++
 package.json                              |  2 +-
 src/layout/navBars/breadcrumb/setings.vue |  1 +
 src/layout/navBars/breadcrumb/user.vue    | 12 ++++--------
 src/layout/upgrade/index.vue              |  5 +++++
 src/theme/dark.scss                       |  8 +++++---
 src/views/error/401.vue                   |  7 +++----
 src/views/login/index.vue                 |  4 ++--
 9 files changed, 39 insertions(+), 18 deletions(-)
 create mode 100644 jsconfig.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dab4829..281a5cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 🎉🎉🔥 `vue-prev-admin` 基于 vue2.x + webpack + element ui，适配手机、平板、pc 的后台开源免费模板库（vue3.x 请切换 master 分支）
 
+## 1.2.1
+
+`2022.12.12`
+
+- 🐞 优化 版本升级提示
+- 🐞 优化 深色模式
+
 ## 1.2.0
 
 `2022.12.06`
diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 0000000..dd2d9dc
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,11 @@
+{
+	"compilerOptions": {
+		"allowJs": true,
+		"lib": ["esnext", "dom", "dom.iterable", "scripthost"],
+		"jsx": "preserve",
+		"baseUrl": ".",
+		"paths": {
+			"/@/*": ["src/*"]
+		}
+	}
+}
diff --git a/package.json b/package.json
index 8382e6c..a181fea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vue-prev-admin",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"private": true,
 	"description": "vue2 webpack admin template",
 	"author": "lyt_20201208",
diff --git a/src/layout/navBars/breadcrumb/setings.vue b/src/layout/navBars/breadcrumb/setings.vue
index 02ceec7..27c0e74 100644
--- a/src/layout/navBars/breadcrumb/setings.vue
+++ b/src/layout/navBars/breadcrumb/setings.vue
@@ -286,6 +286,7 @@ export default {
 			const body = document.documentElement;
 			if (this.getThemeConfig.isIsDark) body.setAttribute('data-theme', 'dark');
 			else body.setAttribute('data-theme', '');
+			this.setLocalThemeConfig();
 		},
 		// 初始化：刷新页面时，设置了值，直接取缓存中的值进行初始化
 		initLayoutConfig() {
diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue
index 1c087ab..8ef8f65 100644
--- a/src/layout/navBars/breadcrumb/user.vue
+++ b/src/layout/navBars/breadcrumb/user.vue
@@ -67,7 +67,6 @@
 
 <script>
 import screenfull from 'screenfull';
-import { resetRouter } from '@/router/index.js';
 import { Session, Local } from '@/utils/storage.js';
 import UserNews from '@/layout/navBars/breadcrumb/userNews.vue';
 import Search from '@/layout/navBars/breadcrumb/search.vue';
@@ -201,13 +200,10 @@ export default {
 						},
 					})
 						.then(() => {
-							Session.clear(); // 清除缓存/token等
-							this.$store.dispatch('routesList/setRoutesList', []); // 清空 vuex 路由列表缓存
-							resetRouter(); // 删除/重置路由
-							this.$router.push('/login');
-							setTimeout(() => {
-								this.$message.success(this.$t('message.user.logOutSuccess'));
-							}, 300);
+							// 清除缓存/token等
+							Session.clear();
+							// 使用 reload 时，不需要调用 resetRoute() 重置路由
+							window.location.reload();
 						})
 						.catch(() => {});
 				}, 150);
diff --git a/src/layout/upgrade/index.vue b/src/layout/upgrade/index.vue
index e2b2c6e..01c91dc 100644
--- a/src/layout/upgrade/index.vue
+++ b/src/layout/upgrade/index.vue
@@ -16,6 +16,11 @@
 			</div>
 			<div class="upgrade-content">
 				{{ getThemeConfig.globalTitle }} {{ $t('message.upgrade.msg') }}
+				<div class="mt5">
+					<el-link type="primary" class="font12" href="https://gitee.com/lyt-top/vue-next-admin/blob/vue-prev-admin/CHANGELOG.md" target="_black">
+						CHANGELOG.md
+					</el-link>
+				</div>
 				<div class="upgrade-content-desc mt5">{{ $t('message.upgrade.desc') }}</div>
 			</div>
 			<div class="upgrade-btn">
diff --git a/src/theme/dark.scss b/src/theme/dark.scss
index a866a7b..ff5247e 100644
--- a/src/theme/dark.scss
+++ b/src/theme/dark.scss
@@ -61,9 +61,11 @@
 	}
 
 	// switch
-	.el-switch__core {
-		border-color: var(--prev-border-color-base) !important;
-		background-color: var(--prev-border-color-base) !important;
+	.el-switch:not(.is-checked) {
+		.el-switch__core {
+			border-color: var(--prev-border-color-base) !important;
+			background-color: var(--prev-border-color-base) !important;
+		}
 	}
 
 	// TimePicker
diff --git a/src/views/error/401.vue b/src/views/error/401.vue
index ec3d88a..82c343b 100644
--- a/src/views/error/401.vue
+++ b/src/views/error/401.vue
@@ -22,16 +22,15 @@
 
 <script>
 import { Session } from '@/utils/storage';
-import { resetRouter } from '@/router';
 export default {
 	name: 'noAuth',
 	methods: {
 		// 重新授权
 		onSetAuth() {
+			// 清除缓存/token等
 			Session.clear();
-			this.$store.commit('setMenuData', {});
-			resetRouter(); // 重置路由
-			this.$router.push('/login');
+			// 使用 reload 时，不需要调用 resetRoute() 重置路由
+			window.location.reload();
 		},
 	},
 };
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 993fcf6..7583e4d 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -64,7 +64,7 @@
 							</div>
 						</el-form-item>
 						<el-form-item style="margin: 40px 0px 0">
-							<el-button type="primary" round class="login-submit" @click="submitForm" :loading="submit.loading">
+							<el-button type="primary" class="login-submit" @click="submitForm" :loading="submit.loading">
 								<span>{{ $t('message.login.btnText') }}</span>
 							</el-button>
 						</el-form-item>
@@ -174,7 +174,7 @@ export default {
 				// 存储用户信息到vuex
 				this.$store.dispatch('userInfos/setUserInfos', userInfos);
 				PrevLoading.start();
-				window.location.href = `${window.location.origin}${window.location.pathname}`;
+				this.$router.push('/');
 				setTimeout(() => {
 					this.$message.success(`${this.currentTime}，${this.$t('message.login.signInText')}`);
 				}, 300);