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

src/layout/components/Navbar.vue

@@ -175,8 +175,8 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
+      // //this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      // //this.setLanguage('zh')
       this.$updateDictionary()
     },
     editInfo() {

src/store/modules/user.js

@@ -282,7 +282,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-download.js

@@ -89,9 +89,9 @@ service.interceptors.response.use(
           })
           store.dispatch('user/logout').then(() => {
             router.push(`/login`)
-            this.$i18n.locale = 'zh'
+            //this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
+            //this.setLanguage('zh')
-            this.$updateDictionary()
+            // this.$updateDictionary()
           })
         }
       } else {

src/utils/request.js

@@ -100,9 +100,11 @@ service.interceptors.response.use(
             console.log(err)
           }
           router.push(`/login`)
-          this.$i18n.locale = 'zh'
+          // if (!this.$i18n.locale) {
-          this.setLanguage('zh')
+          //   //this.$i18n.locale = 'zh'
-          this.$updateDictionary()
+          //   //this.setLanguage('zh')
+          // }
+          // this.$updateDictionary()
         })
       }
       switch (status) {
@@ -132,9 +134,9 @@ service.interceptors.response.use(
           }
           store.dispatch('user/logout').then(() => {
             router.push(`/login`)
-            this.$i18n.locale = 'zh'
+            // //this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
+            // //this.setLanguage('zh')
-            this.$updateDictionary()
+            // this.$updateDictionary()
           })
         } else {
           setTimer({

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/dashboard/bigdata.vue

@@ -131,8 +131,8 @@ export default {
         .then(() => {
           this.$store.dispatch('user/logout').then(res => {
             this.$router.push(`/login`)
-            this.$i18n.locale = 'zh'
+            //this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
+            //this.setLanguage('zh')
             this.$updateDictionary()
           })
         })

src/views/email-recompose/index.vue

@@ -195,8 +195,8 @@ export default {
         this.$router.push(`/login`)
       }
       if (!this.$i18n.locale) {
-        this.$i18n.locale = 'zh'
+        //this.$i18n.locale = 'zh'
-        this.setLanguage('zh')
+        //this.setLanguage('zh')
       }
       this.$updateDictionary()
     },

src/views/recompose/index.vue

@@ -145,8 +145,8 @@ export default {
         this.$router.push(`/login`)
       }
       if (!this.$i18n.locale) {
-        this.$i18n.locale = 'zh'
+        //this.$i18n.locale = 'zh'
-        this.setLanguage('zh')
+        //this.setLanguage('zh')
       }
       this.$updateDictionary()
     },

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

src/views/trials/trials-layout/components/trialsNavbar.vue

@@ -221,8 +221,8 @@ export default {
     async logout() {
       await this.$store.dispatch('user/logout')
       this.$router.push(`/login`)
-      this.$i18n.locale = 'zh'
+      //this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      //this.setLanguage('zh')
       this.$updateDictionary()
     },
     go(value) {

src/views/trials/trials-myinfo/account.vue

@@ -333,8 +333,8 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
+      //this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      //this.setLanguage('zh')
       this.$updateDictionary()
     },
   },

src/views/trials/trials-myinfo/password.vue

@@ -151,8 +151,8 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
+      //this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      //this.setLanguage('zh')
       this.$updateDictionary()
     },
   },

src/views/user/myInfo.vue

@@ -569,8 +569,8 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
+      //this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      //this.setLanguage('zh')
       this.$updateDictionary()
     },
   },