From af6b082ebd879f9c4fa9dc0535b6691da378e4bc Mon Sep 17 00:00:00 2001
From: lyt-Top <1105290566@qq.com>
Date: Sun, 23 May 2021 16:50:21 +0800
Subject: [PATCH] =?UTF-8?q?'admin-21.05.23:=E4=BF=AE=E5=A4=8D=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98=E6=B5=8F=E8=A7=88=E5=99=A8=E7=AA=97=E5=8F=A3=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=83=A8=E5=88=86=E5=B8=83=E5=B1=80=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  | 80 +++++++++----------
 src/views/layout/index.vue                    |  2 +-
 .../layout/navBars/breadcrumb/setings.vue     |  4 +
 3 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/package.json b/package.json
index db79909..d182d90 100644
--- a/package.json
+++ b/package.json
@@ -1,42 +1,42 @@
 {
-  "name": "vue-prev-admin",
-  "version": "1.0.0",
-  "private": true,
-  "scripts": {
-    "dev": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint",
-    "webpack": "webpack --version"
-  },
-  "dependencies": {
-    "axios": "^0.21.1",
-    "clipboard": "^2.0.8",
-    "core-js": "^3.12.1",
-    "countup.js": "^2.0.7",
-    "echarts": "^5.1.1",
-    "element-ui": "^2.15.1",
-    "nprogress": "^0.2.0",
-    "screenfull": "^5.1.0",
-    "sign-canvas": "^1.1.4",
-    "vue": "^2.6.12",
-    "vue-i18n": "^8.24.4",
-    "vue-particles": "^1.0.9",
-    "vue-router": "^3.5.1",
-    "vue-seamless-scroll": "^1.1.23",
-    "vuex": "^3.6.2"
-  },
-  "devDependencies": {
-    "@eslint/eslintrc": "^0.4.1",
-    "@vue/cli-plugin-babel": "~4.5.13",
-    "@vue/cli-plugin-eslint": "~4.5.13",
-    "@vue/cli-plugin-router": "~4.5.13",
-    "@vue/cli-plugin-vuex": "~4.5.13",
-    "@vue/cli-service": "~4.5.13",
-    "babel-eslint": "^10.1.0",
-    "eslint": "^7.26.0",
-    "eslint-plugin-vue": "^7.9.0",
-    "sass": "^1.32.13",
-    "sass-loader": "^10.1.1",
-    "vue-template-compiler": "^2.6.12"
-  }
+	"name": "vue-prev-admin",
+	"version": "1.0.0",
+	"private": true,
+	"scripts": {
+		"dev": "vue-cli-service serve",
+		"build": "vue-cli-service build",
+		"lint": "vue-cli-service lint",
+		"webpack": "webpack --version"
+	},
+	"dependencies": {
+		"axios": "^0.21.1",
+		"clipboard": "^2.0.8",
+		"core-js": "^3.12.1",
+		"countup.js": "^2.0.7",
+		"echarts": "^5.1.1",
+		"element-ui": "^2.15.1",
+		"nprogress": "^0.2.0",
+		"screenfull": "^5.1.0",
+		"sign-canvas": "^1.1.4",
+		"vue": "^2.6.12",
+		"vue-i18n": "^8.24.4",
+		"vue-particles": "^1.0.9",
+		"vue-router": "^3.5.1",
+		"vue-seamless-scroll": "^1.1.23",
+		"vuex": "^3.6.2"
+	},
+	"devDependencies": {
+		"@eslint/eslintrc": "^0.4.1",
+		"@vue/cli-plugin-babel": "~4.5.13",
+		"@vue/cli-plugin-eslint": "~4.5.13",
+		"@vue/cli-plugin-router": "~4.5.13",
+		"@vue/cli-plugin-vuex": "~4.5.13",
+		"@vue/cli-service": "~4.5.13",
+		"babel-eslint": "^10.1.0",
+		"eslint": "^7.27.0",
+		"eslint-plugin-vue": "^7.9.0",
+		"sass": "^1.34.0",
+		"sass-loader": "^10.1.1",
+		"vue-template-compiler": "^2.6.12"
+	}
 }
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index a3c84b9..53ad6c3 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -38,7 +38,7 @@ export default {
 				});
 			} else {
 				this.bus.$emit('layoutMobileResize', {
-					layout: getLocal('oldLayout') ? getLocal('oldLayout') : 'defaults',
+					layout: getLocal('oldLayout') ? getLocal('oldLayout') : this.$store.state.themeConfig.themeConfig.layout,
 					clientWidth,
 				});
 			}
diff --git a/src/views/layout/navBars/breadcrumb/setings.vue b/src/views/layout/navBars/breadcrumb/setings.vue
index 635e706..068ebad 100644
--- a/src/views/layout/navBars/breadcrumb/setings.vue
+++ b/src/views/layout/navBars/breadcrumb/setings.vue
@@ -194,8 +194,12 @@ export default {
 		},
 	},
 	created() {
+		// 判断当前布局是否不相同，不相同则初始化当前布局的样式，防止监听窗口大小改变时，布局配置logo、菜单背景等部分布局失效问题
+		if (!getLocal('frequency')) this.initSetLayoutChange();
+		setLocal('frequency', 1);
 		// 监听窗口大小改变，非默认布局，设置成默认布局（适配移动端）
 		this.bus.$on('layoutMobileResize', (res) => {
+			if (this.$store.state.themeConfig.themeConfig.layout === res.layout) return false;
 			this.$store.state.themeConfig.themeConfig.layout = res.layout;
 			this.$store.state.themeConfig.themeConfig.isDrawer = false;
 			this.$store.state.themeConfig.themeConfig.isCollapse = false;