Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1

src/App.vue

@@ -80,8 +80,9 @@ export default {
     },
     created() {
         this.project = getSessionStorage('project');
-        if (this.project) {
-            document.querySelector("link[rel*='icon']").href = loginInfo[this.project].linkIcon || ProjectIcon[this.project];
+        const linkIcon = loginInfo[this.project] ? loginInfo[this.project].linkIcon : (ProjectIcon[this.project] || '');
+        if (this.project && linkIcon) {
+            document.querySelector("link[rel*='icon']").href = linkIcon;
         }
     },
     mounted() {

src/i18n/langs/en/login.js

@@ -18,5 +18,7 @@ export default {
     getLoginQrCode: 'Failed to get login qr code, please refresh and try again',
     language: 'Language',
     clickSwitchLanguage: 'Click switch language',
-    accountName: 'Account name'
+    accountName: 'Account name',
+    registerAccount: 'Register account',
+    forgetPassword: 'Forget password?'
 };

src/i18n/langs/zh/login.js

@@ -18,5 +18,7 @@ export default {
     getLoginQrCode: '获取登录二维码失败，请刷新重试',
     language: '语言',
     clickSwitchLanguage: '点击切换语言',
-    accountName: '账户名'
+    accountName: '账户名',
+    registerAccount: '注册账号',
+    forgetPassword: '忘记密码？'
 };

src/layout/index.vue

@@ -72,10 +72,10 @@ export default {
             return this.$store.state.app.dialogMessage;
         },
         companyInfo() {
-            return loginInfo[getSessionStorage('project')].bottomColumn;
+            return loginInfo[getSessionStorage('project')] ? loginInfo[getSessionStorage('project')].bottomColumn : '';
         },
         bottomIcon() {
-            return loginInfo[getSessionStorage('project')].bottomIcon;
+            return loginInfo[getSessionStorage('project')] ? loginInfo[getSessionStorage('project')].bottomIcon : '';
         }
     },
     watch:{

src/views/login/normalLogin.vue

@@ -61,7 +61,7 @@
         </div>
       </el-popover> -->
       <div class="popover_box active" @click="registerUser">
-        注册账号
+        {{ $t('login.registerAccount') }}
       </div>
     </div>
     <el-form-item>
@@ -71,7 +71,7 @@
     </el-form-item>
     <div v-if="!localProject" style="display: inline-block;width: 100%;">
       <div class="popover_box active" style="bottom: 50px;" @click="forgetPassword">
-        忘记密码？
+        {{ $t('login.forgetPassword') }}
       </div>
     </div>
   </el-form>