From 1d9214a5a1bcecb2d7347b94de29fb7fe5cb43c4 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Wed, 9 Aug 2023 18:32:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Login.vue          | 17 +++++++++--------
 src/i18n/index.js      |  6 ------
 src/permission.js      |  4 +---
 src/utils/constants.js |  3 +--
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/Login.vue b/src/Login.vue
index 7a8a1a99..e49cd496 100644
--- a/src/Login.vue
+++ b/src/Login.vue
@@ -39,10 +39,10 @@
 
 <script>
 import { mapActions } from 'vuex'
-import { post, get } from '@/utils/http'
+import { get } from '@/utils/http'
 import axios from 'axios'
 import { useRouter } from 'vue-router'
-import { storageKey } from '@/utils/constants'
+import { storageKey, defaultLang } from '@/utils/constants'
 import { api } from '@/utils/api'
 import dayjs from 'dayjs'
 import _ from 'lodash'
@@ -73,17 +73,18 @@ export default {
       axios.post(api.login, { username: this.username, pin: this.pin }).then(
         res => {
           if (res.data.code === 200) {
-            if (!_.isEmpty(res.data.data.lang)) {
-              localStorage.setItem(storageKey.language, res.data.data.lang)
+            if (!_.isEmpty(res.data.data.user.lang)) {
+              localStorage.setItem(storageKey.language, res.data.data.user.lang)
             }
-            if (!_.isEmpty(res.data.data.theme)) {
-              localStorage.setItem(storageKey.theme, res.data.data.theme)
+            if (!_.isEmpty(res.data.data.user.theme)) {
+              localStorage.setItem(storageKey.theme, res.data.data.user.theme)
             }
             res.loginSuccessPath = this.$route.query.redirect
             this.loginSuccess(res)
             localStorage.setItem(storageKey.username, this.username)
-            localStorage.setItem(storageKey.userId, res.data.data.user ? res.data.data.user.userId : res.data.data.userId)
+            localStorage.setItem(storageKey.userId, res.data.data.user.userId)
             localStorage.setItem(storageKey.token, res.data.data.token)
+            this.$i18n.locale = localStorage.getItem(storageKey.language)
           } else if (res.data.code === 518005) {
             this.$message.error(this.$t('Incorrect username or password'))
             this.loading = false
@@ -110,7 +111,7 @@ export default {
     },
     appearanceOut (data) {
       if (_.isEmpty(localStorage.getItem(storageKey.language))) {
-        localStorage.setItem(storageKey.language, data.lang || 'zh')
+        localStorage.setItem(storageKey.language, data.lang || defaultLang)
       }
       if (_.isEmpty(localStorage.getItem(storageKey.theme))) {
         localStorage.setItem(storageKey.theme, data.theme || 'light')
diff --git a/src/i18n/index.js b/src/i18n/index.js
index 7ba85d34..1dce8961 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -2,15 +2,9 @@ import { createI18n } from 'vue-i18n/index'
 import { storageKey } from '@/utils/constants'
 import { getI18n } from '@/utils/api'
 import store from '@/store'
-// import cn from './cn'
-// import en from './en'
 
 const i18n = createI18n({
   locale: localStorage.getItem(storageKey.language) || 'en'
-  /* messages: {
-    cn: cn,
-    en: en
-  } */
 })
 export async function loadI18n () {
   if (!store.state.i18n) {
diff --git a/src/permission.js b/src/permission.js
index 80e7c67f..35f9f58a 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -22,9 +22,7 @@ router.beforeEach(async (to, from, next) => {
   }
   if (localStorage.getItem(storageKey.token)) {
     // 加载i18n
-    if (!localStorage.getItem(storageKey.i18n)) {
-      await loadI18n()
-    }
+    await loadI18n()
     // 加载权限
     if (permissionWhiteList.indexOf(to.path) !== -1) {
       next()
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 1d8db03d..6435d5d0 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -1,5 +1,5 @@
 export const defaultPageSize = 20
-
+export const defaultLang = 'en'
 // indexedDB库名
 export const dbName = 'cn-db'
 // indexedDB表名
@@ -16,7 +16,6 @@ export const dbGalaxySettingTableColumnCustomizeConfig = 'cn-table-column-custom
 export const storageKey = {
   iso36112Capital: 'cn-iso3611-2-capital',
   iso36112WorldLow: 'cn-iso3611-2-world-low',
-  i18n: 'cn-i18n',
   s3Enable: 'cn-s3-enable',
   languages: 'cn-languages',
   language: 'cn-language',