Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

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)

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);

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')}`:''

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>

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;

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>

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')}`:''

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>

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>