From 66cbbbbb75f64b2fb03a2957e81b48695953f020 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Jan 2025 11:28:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=80=E5=87=BA=E8=87=B3=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js          | 2 ++
 src/utils/request.js               | 2 ++
 src/views/blindResumeInfo/info.vue | 4 ++--
 src/views/resumeInfo/index.vue     | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 07cfc266..d5894a69 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -299,7 +299,9 @@ const actions = {
       // })
       resetRouter()
       removeName()
+      let lang = zzSessionStorage.getItem('lang')
       zzSessionStorage.clear()
+      zzSessionStorage.setItem('lang', lang)
       commit('RESET_STATE')
     } catch (e) {
       console.log(e)
diff --git a/src/utils/request.js b/src/utils/request.js
index a8d5e132..e08153f7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -180,6 +180,8 @@ const setTimer = (obj, type) => {
       Message(obj)
     }
     if (type === 'confirm') {
+      obj[2].closeOnClickModal = false
+      obj[2].closeOnPressEscape = false
       MessageBox.confirm(...obj)
     }
     clearTimeout(timer);
diff --git a/src/views/blindResumeInfo/info.vue b/src/views/blindResumeInfo/info.vue
index 1fd40263..2c2305e2 100644
--- a/src/views/blindResumeInfo/info.vue
+++ b/src/views/blindResumeInfo/info.vue
@@ -86,8 +86,8 @@ export default {
         this.setLanguage('en')
         this.$updateDictionary()
       } else {
-        //this.$i18n.locale = 'zh'
-        //this.setLanguage('zh')
+        this.$i18n.locale = 'zh'
+        this.setLanguage('zh')
         this.$updateDictionary()
       }
       this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.BlindName}${this.$t('resumeInfo:title:Details')}`:''
diff --git a/src/views/resumeInfo/index.vue b/src/views/resumeInfo/index.vue
index 50c565c1..3a801144 100644
--- a/src/views/resumeInfo/index.vue
+++ b/src/views/resumeInfo/index.vue
@@ -98,8 +98,8 @@ export default {
         this.setLanguage('en')
         this.$updateDictionary()
       } else {
-        //this.$i18n.locale = 'zh'
-        //this.setLanguage('zh')
+        this.$i18n.locale = 'zh'
+        this.setLanguage('zh')
         this.$updateDictionary()
       }
       this.title =this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`:''

From 42083afb8d82fbb99e164aa3b3d18b8f1075b080 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Jan 2025 14:01:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=81=AE=E6=8C=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/email-recompose/index.vue         | 5 +++--
 src/views/forgetpassword/index.vue          | 2 +-
 src/views/recompose/index.vue               | 4 ++++
 src/views/trials/trials-myinfo/password.vue | 5 +++--
 src/views/user/myInfo.vue                   | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index 7e3e8f42..b47e1f5f 100644
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@@ -38,6 +38,7 @@
         </el-form-item>
         <!-- 新密码 -->
         <el-form-item
+          class="my_new_pwd"
           :label="$t('recompose:form:newPassword')"
           prop="NewPassWord"
         >
@@ -272,7 +273,7 @@ input {
   background-color: transparent;
   caret-color: #fff;
 }
-.el-form-item {
-  margin-bottom: 30px;
+::v-deep .is-error.my_new_pwd {
+  margin-bottom: 45px;
 }
 </style>
diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index d66f6c34..170a0c5c 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -423,7 +423,7 @@ export default {
 /*  margin-bottom: 40px;*/
 /*}*/
 .is-error.my_new_pwd {
-  margin-bottom: 40px;
+  margin-bottom: 45px;
 }
 .flexBox {
   display: flex;
diff --git a/src/views/recompose/index.vue b/src/views/recompose/index.vue
index da7365e4..7fcb08e3 100644
--- a/src/views/recompose/index.vue
+++ b/src/views/recompose/index.vue
@@ -42,6 +42,7 @@
         </el-form-item>
         <!-- 新密码 -->
         <el-form-item
+          class="my_new_pwd"
           :label="$t('recompose:form:newPassword')"
           prop="NewPassWord"
         >
@@ -221,4 +222,7 @@ input {
   background-color: transparent;
   caret-color: #fff;
 }
+::v-deep .is-error.my_new_pwd {
+  margin-bottom: 45px;
+}
 </style>
diff --git a/src/views/trials/trials-myinfo/password.vue b/src/views/trials/trials-myinfo/password.vue
index f16a0569..ce97b99e 100644
--- a/src/views/trials/trials-myinfo/password.vue
+++ b/src/views/trials/trials-myinfo/password.vue
@@ -27,6 +27,7 @@
       <!-- 新密码 -->
       <el-form-item
         :label="$t('recompose:form:newPassword')"
+        class="my_new_pwd"
         prop="NewPassWord"
       >
         <el-input
@@ -159,7 +160,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-form-item {
-  margin-bottom: 30px;
+::v-deep .is-error.my_new_pwd {
+  margin-bottom: 45px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/user/myInfo.vue b/src/views/user/myInfo.vue
index 17ccc97b..b79417d1 100644
--- a/src/views/user/myInfo.vue
+++ b/src/views/user/myInfo.vue
@@ -659,6 +659,6 @@ export default {
 </style>
 <style scoped>
 ::v-deep .is-error.my_new_pwd {
-  margin-bottom: 40px;
+  margin-bottom: 45px;
 }
 </style>