From 7387f4d1d314b363110a5e226f36cad1f86c4ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Wed, 22 Mar 2023 23:34:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81=E8=BE=93=E5=85=A5=E9=94=99=E8=AF=AF=E5=90=8E=E4=B8=8D?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E4=BB=A5=E5=8F=8A=E9=85=8D=E7=BD=AE=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E4=B8=8D=E7=AB=8B=E9=A9=AC=E7=94=9F=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/src/views/auth/login/login.vue | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/snowy-admin-web/src/views/auth/login/login.vue b/snowy-admin-web/src/views/auth/login/login.vue
index 41cbafe7..016d2b21 100644
--- a/snowy-admin-web/src/views/auth/login/login.vue
+++ b/snowy-admin-web/src/views/auth/login/login.vue
@@ -57,7 +57,7 @@
 										</template>
 									</a-input-password>
 								</a-form-item>
-								<a-form-item name="validCode" v-if="captchaOpen">
+								<a-form-item name="validCode" v-if="captchaOpen === 'true'">
 									<a-row :gutter="8">
 										<a-col :span="17">
 											<a-input
@@ -120,6 +120,7 @@
 			return {
 				activeKey: 'userAccount',
 				sysBaseConfig: store.state.global.sysBaseConfig || tool.data.get('SNOWY_SYS_BASE_CONFIG'),
+				captchaOpen: tool.data.get('SNOWY_SYS_BASE_CONFIG').SNOWY_SYS_DEFAULT_CAPTCHA_OPEN,
 				validCodeBase64: '',
 				ruleForm: {
 					account: 'superAdmin',
@@ -149,18 +150,13 @@
 				]
 			}
 		},
-		computed: {
-			captchaOpen() {
-				return this.sysBaseConfig.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN === 'true'
-			}
-		},
 		watch: {
 			'config.theme': function (val) {
 				document.body.setAttribute('data-theme', val)
 			},
 			'config.lang': function (val) {
 				this.$i18n.locale = val
-				this.$TOOL.data.set('APP_LANG', val)
+				tool.data.set('APP_LANG', val)
 			}
 		},
 		created() {
@@ -175,6 +171,7 @@
 					data.forEach((item) => {
 						formData.value[item.configKey] = item.configValue
 					})
+					this.captchaOpen = formData.value.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN
 					tool.data.set('SNOWY_SYS_BASE_CONFIG', formData.value)
 					store.commit('SET_sysBaseConfig', formData.value)
 					this.refreshSwitch()
@@ -185,7 +182,7 @@
 			// 通过开关加载内容
 			refreshSwitch() {
 				// 判断是否开启验证码
-				if (this.captchaOpen) {
+				if (this.captchaOpen === 'true') {
 					// 加载验证码
 					this.loginCaptcha()
 					// 加入校验
@@ -216,6 +213,7 @@
 						afterLogin(loginToken)
 					} catch (err) {
 						this.loading = false
+						this.loginCaptcha()
 					}
 				})
 			},