From 5b5f654e736088280cbccf0855436944244248bb Mon Sep 17 00:00:00 2001
From: lelegezi <luoluogezi123456@126.com>
Date: Sat, 22 Jan 2022 09:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=86=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=9A1=E3=80=81=E6=8B=BC=E5=86=99=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=202=E3=80=81=E6=95=B4=E4=B8=AA=E4=B8=80=E5=8F=A5?=
 =?UTF-8?q?=E7=9A=84=E9=A6=96=E5=AD=97=E6=AF=8D=E5=A4=A7=E5=86=99=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AF=E6=AF=8F=E4=B8=AA=E5=8D=95=E8=AF=8D=E7=9A=84?=
 =?UTF-8?q?=E9=A6=96=E5=AD=97=E6=AF=8D=E5=A4=A7=E5=86=99=203=E3=80=81?=
 =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E4=B8=80=E6=9D=A1=E6=B0=B4=E5=B9=B3=E7=BA=BF?=
 =?UTF-8?q?=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webapp/src/utils/locale/en.js | 24 ++++++++++++------------
 webapp/src/views/login.vue    | 14 +++++++-------
 webapp/src/views/register.vue | 18 +++++++++---------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/webapp/src/utils/locale/en.js b/webapp/src/utils/locale/en.js
index 659d491..23753aa 100644
--- a/webapp/src/utils/locale/en.js
+++ b/webapp/src/utils/locale/en.js
@@ -10,35 +10,35 @@ const lang = {
   head: 'vLoong AI platform',
   headed: 'Battery AI+ algorithm development platform',
 
-  userType: 'UserType',
-  universityusers: 'universityusers',
-  enterpriseusers: 'enterpriseusers',
-  i18nusername: 'Username',
-  placei18nusername: 'Please enter username',
-  i18nname: 'Real Name',
+  userType: 'User type',
+  universityusers: 'university users',
+  enterpriseusers: 'enterprise users',
+  i18nusername: 'User name',
+  placei18nusername: 'Please enter user name',
+  i18nname: 'Real name',
   placei18nname: 'Please enter your real name',
-  i18nphone: 'Mobile Phone',
+  i18nphone: 'Mobile phone',
   placei18nphone: 'Please enter your mobile phone number',
   i18nnick: 'Nickname',
   placei18nnick: 'Please enter a nickname',
   i18nsex: 'Gender',
   i18nsex1: 'men',
   i18nsex2: 'women',
-  i18nschool: 'School/Compant Name',
+  i18nschool: 'School/Company name',
   placei18nschool: 'Please enter school/company name',
-  i18nemail: 'Campus/Enterprise Email',
+  i18nemail: 'Campus/Enterprise email',
   placei18nemail: 'Please enter campus/enterprise email',
-  i18nverification: 'Email Verification Code',
+  i18nverification: 'Email verification code',
   placei18nverification: 'Please enter the verification code',
   i18npassword: 'Password',
   placei18npassword: 'Please enter your password',
-  i18nagainpassword: 'Confirm Password',
+  i18nagainpassword: 'Confirm password',
   placei18nagainpassword: 'Please enter your password again',
   i18nregistered: 'REGISTER',
   i18nExistingaccount: 'Already have an account?',
   i18nTologin: 'Login',
   i18nsendverification: 'send code',
-  labelWidth: '43%',
+  labelWidth: '47%',
   //登录页面
   logini18nVerification:'Verification code',
   logini18nrememberme:'Remember me',
diff --git a/webapp/src/views/login.vue b/webapp/src/views/login.vue
index 551d6df..295cc77 100644
--- a/webapp/src/views/login.vue
+++ b/webapp/src/views/login.vue
@@ -70,12 +70,12 @@ the License. * ============================================================= */
         <!-- 记住我 -->
         <el-form-item>
           <div class="clearfix">
-            <el-checkbox v-model="loginForm.rememberMe" class="my-checkbox">{{
+            <el-checkbox style="vertical-align:middle" v-model="loginForm.rememberMe" class="my-checkbox">{{
               $t("logini18nrememberme")
             }}</el-checkbox>
             <el-button
               type="text"
-              style="float: right"
+              style="float: right;vertical-align:middle"
               @click="$router.replace({ path: '/resetpassword' })"
               >{{ $t("logini18nForgotpassword") }}</el-button
             >
@@ -88,7 +88,7 @@ the License. * ============================================================= */
             <el-button
               v-if="loginConfig.allowRegister"
               type="text"
-              style="float: right; margin-right: 10px"
+              style="float: right; margin-right: 10px;vertical-align:middle"
               @click="$router.replace({ path: '/register' })"
               >{{ $t("logini18nRegister") }}</el-button
             >
@@ -112,7 +112,7 @@ the License. * ============================================================= */
                 :underline="false"
                 @click="handleShowDialog('agreement')"
                 >{{ $t("logini18nTermsofUse") }}</el-link
-              >
+              >             
               <!-- 和 -->
             <el-link
               :underline="false"
@@ -126,9 +126,9 @@ the License. * ============================================================= */
               @click="handleShowDialog('privacy')"
               >{{ $t("logini18nprivacy") }}</el-link
             >
-
-
-
+      
+         
+            
           </div>
           <!-- 登录 -->
           <el-button
diff --git a/webapp/src/views/register.vue b/webapp/src/views/register.vue
index 1989150..9161ecb 100644
--- a/webapp/src/views/register.vue
+++ b/webapp/src/views/register.vue
@@ -280,11 +280,11 @@ export default {
     let idnexlang = sessionStorage.getItem('language_ch')
     // console.log(idnexlang,'=======');
     if(idnexlang=='Ch'){
-      this.slelct_Chinese()
+      this.slelct_Chinese() 
     }else if(idnexlang=='En'){
-      this.slelct_english()
+      this.slelct_english() 
     }
-
+   
   },
   methods: {
     // 语言切换
@@ -302,8 +302,8 @@ export default {
       this.$i18n.locale = "zh-CN";
       this.buttonName = this.$t("i18nsendverification");
       this.$set(this.registerRules.userType[0], "message", "请输选择用户类型");
-      this.$set(this.registerRules.username[0], "message", "请输入真实姓名");
-      this.$set(this.registerRules.fullName[0], "message", "请输入用户姓名");
+      this.$set(this.registerRules.username[0], "message", "请输入用户姓名");
+      this.$set(this.registerRules.fullName[0], "message", "请输入真实姓名");
       this.$set(this.registerRules.nickName[0], "message", "请输入用户昵称");
       this.$set(this.registerRules.phone[0], "message", "请输入手机号码");
       this.$set(
@@ -335,7 +335,7 @@ export default {
       this.register_form = false;
       this.$i18n.locale = "en";
       this.buttonName = this.$t("i18nsendverification");
-      this.$set(this.registerRules.userType[0], "message", "userType");
+      this.$set(this.registerRules.userType[0], "message", "User type");
       this.$set(
         this.registerRules.username[0],
         "message",
@@ -344,7 +344,7 @@ export default {
       this.$set(
         this.registerRules.fullName[0],
         "message",
-        "Please enter realame"
+        "Please enter real name"
       );
       this.$set(
         this.registerRules.nickName[0],
@@ -364,7 +364,7 @@ export default {
       this.$set(
         this.registerRules.entityName[0],
         "message",
-        "Please enter school/compant name"
+        "Please enter school/company name"
       );
       this.$set(
         this.registerRules.email[0],
@@ -518,7 +518,7 @@ export default {
 .register-form {
   width: 580px;
   font-size: 20px !important;
-
+  
 }
 .register-form  .el-input__inner::placeholder{
   font-size: 18px;