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

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.$i18n.locale = 'zh'
-        //this.setLanguage('zh')
+        this.setLanguage('zh')
         this.$updateDictionary()
       }
       this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.BlindName}${this.$t('resumeInfo:title:Details')}`:''

src/views/resumeInfo/index.vue

@@ -98,8 +98,8 @@ export default {
         this.setLanguage('en')
         this.$updateDictionary()
       } else {
-        //this.$i18n.locale = 'zh'
+        this.$i18n.locale = 'zh'
-        //this.setLanguage('zh')
+        this.setLanguage('zh')
         this.$updateDictionary()
       }
       this.title =this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`:''