Fix: redirect to install page

MCSManager · Aug 27, 2022 · 84e4b05 · 84e4b05
1 parent f2512e4
commit 84e4b05
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/src/app/App.vue b/src/app/App.vue
@@ -75,14 +75,31 @@ export default {
   async created() {
     let needToRoot = false;
 
+    try {
+      // Get current panel status information
+      const statusInfo = await requestPanelStatus();
+      if (statusInfo.language) {
+        console.log("SET_LANGUAGE:", statusInfo.language, statusInfo);
+        this.$i18n.locale = statusInfo.language;
+      } else {
+        this.$i18n.locale = "en_us";
+      }
+      // If not installed, must route to /install
+      if (statusInfo?.isInstall === false) {
+        return router.push({ path: "/install" });
+      }
+    } catch (error) {
+      alert(`Err: ${error}, Please refresh!`);
+    }
+
     try {
       // After the first refresh, try to get user data once
       // If it fails, navigate to / view to further decide the jump route
       await setupUserInfo();
       const userInfo = this.$store.state.userInfo;
       if (!userInfo || !userInfo.uuid) throw new Error("userInfo.uuid is null");
     } catch (error) {
-      console.log(error);
+      console.log("App.vue redirected to root.vue");
       needToRoot = true;
     }
 

diff --git a/src/app/i18n.js b/src/app/i18n.js
@@ -3,7 +3,7 @@ import zh_cn from "../language/zh_cn"
 import en_us from "../language/en_us"
 
 const i18n = createI18n({
-    locale: 'zh_cn',
+    locale: 'en_us',
     fallbackLocale: 'en_us',
     messages: {
         zh_cn,

diff --git a/src/app/views/Root.vue b/src/app/views/Root.vue
@@ -13,7 +13,7 @@
 <script>
 import Panel from "../../components/Panel";
 import router from "../router";
-import { requestPanelStatus, setupUserInfo } from "../service/protocol";
+import { setupUserInfo } from "../service/protocol";
 
 export default {
   components: { Panel },
@@ -30,21 +30,6 @@ export default {
       }
     },
     async init() {
-      try {
-        // Get current panel status information
-        const statusInfo = await requestPanelStatus();
-        if (statusInfo.language) {
-          console.log("SET_LANGUAGE:", statusInfo.language, statusInfo);
-          this.$i18n.locale = statusInfo.language;
-        } else {
-          this.$i18n.locale = "en_us";
-        }
-        // If not installed, must route to /install
-        if (statusInfo?.isInstall === false) return router.push({ path: "/install" });
-      } catch (error) {
-        alert(`Err: ${error}, Please refresh!`);
-      }
-
       try {
         // In order to adapt to seamless login, data must be requested again here
         if (this.$store.state.userInfo?.permission && this.$store.state.userInfo?.uuid)