Browse Source

系统信息问题修改

gcj 3 years ago
parent
commit
28e0f86ede
2 changed files with 7 additions and 7 deletions
  1. 5 4
      src/utils/i18n.js
  2. 2 3
      src/views/login/index.vue

+ 5 - 4
src/utils/i18n.js

@@ -59,12 +59,13 @@ export function updateWordPack(Parameter) {
       let wordPack = Object.assign(localWord, data.word_pack);
 
       i18n.setLocaleMessage(data.language_type, wordPack);
+      resolve()
       // localStorage.setItem('i18n-message', JSON.stringify(i18n.messages));
+    }).catch(err => {
+      reject(err);
     });
-    resolve()
-  }).catch(err => {
-    reject(err)
-  });
+
+  })
 }
 
 export default i18n;

+ 2 - 3
src/views/login/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="index" v-if="isData">
+  <div class="index" v-if="isData && configInfor">
     <template v-if="isPc">
       <div class="shadow" v-if="LoginOrRegistration != 'signin'">
         <LoginNav
@@ -316,7 +316,7 @@ export default {
       });
     },
     // 验证用户是否登录
-    Islogin() {
+    async Islogin() {
       let userInfor = getToken();
       let user_code = "",
         user_type = "",
@@ -339,7 +339,6 @@ export default {
             removeToken();
           } else {
             this.userMessage = userInfor;
-
             if (
               userInfor.popedom_code_list.indexOf(2000001) > -1 ||
               userInfor.user_type == "STUDENT"