Просмотр исходного кода

fix:修改国际版翻译问题

xzh 4 лет назад
Родитель
Сommit
7229bb6b97

+ 1 - 1
mobile/src/components/editInvoice/edit.vue

@@ -203,7 +203,7 @@ export default {
           },
           {
             name: '电子邮箱',
-            En: 'Email',
+            En: 'E-mail',
             val: emailAddress
           }
         ]

+ 2 - 2
mobile/src/lang/en/modules/agent.js

@@ -40,8 +40,8 @@ module.exports = {
         "positionPlaceholder": "Please Input the Title",
         "phoneLabel": "Phone",
         "phonePlaceholder": "Please Input the Phone",
-        "emailLabel": "Email",
-        "emailPlaceholder": "Please Input the Email",
+        "emailLabel": "E-mail",
+        "emailPlaceholder": "Please Input the E-mail",
         "submit": "Submit"
     }
 }

+ 2 - 2
mobile/src/lang/en/modules/login.js

@@ -18,12 +18,12 @@ module.exports = {
     "rePassword": "Enter password again",
     "cluse": "I have read 《4DKanKan User Agreement》",
     "findPassword": "Password Reset",
-    "emailPlaceholder": "E-mail",
+    "emailPlaceholder": "Please enter your email address",
     "hasAccount": "Already Have An Account, ",
     "zhijieLogin": "Log in Now",
     "resendTime": "{time}s resend",
     "passwordTip": "Password must contain English case and numbers no less than 8-16 characters",
-    "currentEmailTip": "Please enter a correct Email address",
+    "currentEmailTip": "Please enter a correct E-mail address",
     "agreeXieyi": "Please read and agree to the user agreement",
     account: 'Account'
 }

+ 1 - 1
mobile/src/pages/account/forget/components/emailForget.vue

@@ -116,7 +116,7 @@ export default {
       let checkStr = [
         {
           name: '邮箱地址',
-          En: 'E-Mail',
+          En: 'E-mail',
           val: this.phone
         }
       ]

+ 1 - 1
mobile/src/pages/account/mailRegister/index.vue

@@ -128,7 +128,7 @@ export default {
       let checkStr = [
         {
           name: '邮箱地址',
-          En: 'E-Mail',
+          En: 'E-mail',
           val: this.phone
         },
         {

+ 8 - 0
pc/src/lang/en/modules/conduct.js

@@ -11,6 +11,14 @@ module.exports = {
         "itemTitle6": "Autonomous Space Modeling in 10 Minutes. (About 100㎡)",
         "itemTitle7": "Multifunctional Editing Tool, Let Space Tell the Story"
     },
+    "sxz": {
+        "bannerTitle": "随心装 . 快速打造心中家的模样",
+        "itemTitle1": "1:1精准复刻真实房源",
+        "itemTitle2": "实物家具建模,让您所见即所得",
+        "itemTitle3": "快速打造3D家装效果,让人工智能真正服务于生活",
+        "itemTitle4": "高效全屋渲染,秒级响应拒绝等待",
+        "itemTitle5": "变装前后同屏看,一眼对比屋内变化"
+    },
     "coreTech": {
         "bannerTitle": "Technology",
         "bannerSubTitle": "Bringing Digital Technologies to the Everyday Life of Common People",

+ 1 - 1
pc/src/lang/en/modules/login.js

@@ -18,7 +18,7 @@ module.exports = {
     "rePassword": "Enter password again",
     "cluse": "I have read 《4DKanKan User Agreement》",
     "findPassword": "Password Reset",
-    "emailPlaceholder": "E-mail",
+    "emailPlaceholder": "Please enter your email address",
     "hasAccount": "Already had an account, ",
     "zhijieLogin": "Log in Now",
     "resendTime": "{time}s resend",

+ 4 - 0
pc/src/page/login/components/forget/emailForm.vue

@@ -105,6 +105,10 @@ export default {
       if (this.emailInterl) {
         return
       }
+      if (!this.form.phone) {
+        this.$toast.show('warn', (this.language === 'en' ? 'E-mail' : '邮箱') + this.langToast['7'])
+        return
+      }
       let res = await this.$store.dispatch('getAuthCode', {
         email: this.form.phone,
         qudao: 'email'

+ 5 - 2
pc/src/page/login/components/register/index.vue

@@ -33,9 +33,12 @@
       <!-- <input placeholder="请输入昵称" type="text" v-model="emailForm.nickname"> -->
       <div class="code-w">
         <input :placeholder="$t('login.emailPlaceholder')" class="phone" type="text" v-model="emailForm.phone">
+      </div>
+      <div class="code-w">
+        <input :placeholder="$t('login.codePlaceholder')"  type="text" v-model="emailForm.authCode">
         <div class="send-code-btn" :class="{'is-disabled': interEmailTime}" @click="getEmailAuthCode">{{ interEmailTime ? $t('login.resendTime', { time: interEmailTime }) : $t('login.sendCodeBtnText')}}</div>
       </div>
-      <input :placeholder="$t('login.codePlaceholder')"  type="text" v-model="emailForm.authCode">
+      
       <div class="password-w" :class="{'show-tip': !emailForm.password && passwordTip}" @mouseleave="passwordTip=false" @click="focusInput('emialInput')" >
         <input maxLength="16" ref="emialInput" :placeholder="passwordTip ? '' : $t('login.setPassword')" autocomplete="new-password "  v-model="emailForm.password" type="password" @mouseover="passwordTip=true" >
         <p>{{$t('login.passwordTip')}}</p>
@@ -167,7 +170,7 @@ export default {
         return
       }
       if (!this.emailForm.phone) {
-        this.$alert(this.$t('login.emailPlaceholder'))
+        this.$toast.show('warn', (this.language === 'en' ? 'E-mail' : '邮箱') + this.langToast['7'])
         return
       }
       let patt = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/