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/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 @@ @@ -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; } 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 @@ @@ -221,4 +222,7 @@ input { background-color: transparent; caret-color: #fff; } +::v-deep .is-error.my_new_pwd { + margin-bottom: 45px; +} 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')}`:'' 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 @@ \ 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 {