From 37fb490c2eed1aeca3246408916339207a57907d Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Wed, 14 Aug 2024 20:31:51 +0800
Subject: [PATCH] 1
---
src/i18n/en.json | 2 +-
src/page/register/index.vue | 10 +++++-----
src/page/authentication/index.vue | 3 +++
src/i18n/zh.json | 2 +-
src/page/authentication/components/nationalityList.vue | 3 +++
5 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/i18n/en.json b/src/i18n/en.json
index eddbc58..8d174a0 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -918,7 +918,7 @@
"电子邮箱": "E-mail",
"设置密码": "Set password",
"请确认密码": "Please confirm your password",
- "邀请码(选填)": "Invitation code (Required)",
+ "邀请码(选填)": "Invitation code (Optional)",
"请输入邀请码": "Please enter the invitation code",
"已有账号": "Have an account",
"我已阅读并同意": "I have read and agree",
diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index f83d2cd..4751632 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -1570,7 +1570,7 @@
"再次输入密码": "再次输入密码",
"资金密码": "资金密码",
"资金密码(6-12个数字)": "资金密码(6-12个数字)",
- "邀请码(选填)": "邀请码(必填)",
+ "邀请码(选填)": "邀请码(选填)",
"我已同意并阅读": "我已同意并阅读",
"注册": "注册",
"注册过？": "注册过？",
diff --git a/src/page/authentication/components/nationalityList.vue b/src/page/authentication/components/nationalityList.vue
index c988bf5..3c52a6f 100644
--- a/src/page/authentication/components/nationalityList.vue
+++ b/src/page/authentication/components/nationalityList.vue
@@ -172,6 +172,9 @@
mounted() {
// this.$emit('excountry', this.countries[this.countryCode])
this.language = this.$i18n.locale
+ if(this.language=='zh-TW'){
+ this.language='zh-CN'
+ }
this.countriesFind = this.countries[this.language]
this.getData();
},
diff --git a/src/page/authentication/index.vue b/src/page/authentication/index.vue
index 230774e..8891fc9 100644
--- a/src/page/authentication/index.vue
+++ b/src/page/authentication/index.vue
@@ -229,6 +229,9 @@
},
created() {
this.language = this.$i18n.locale;
+ if(this.language=='zh-TW'){
+ this.language='zh-CN'
+ }
this.fetchInfo();
},
methods: {
diff --git a/src/page/register/index.vue b/src/page/register/index.vue
index 3718f4e..b94b2e9 100644
--- a/src/page/register/index.vue
+++ b/src/page/register/index.vue
@@ -14,7 +14,7 @@
<ExInput :label="$t('设置密码')" :placeholderText="$t('密码（6-12个字符）')" v-model="password" typeText="password" />
<ExInput :label="$t('确认密码')" :placeholderText="$t('请确认密码')" v-model="repassword" typeText="password" />
- <ExInput :label="$t('邀请码(选填)')" :placeholderText="$t('请输入邀请码')" v-model="invitCode" :clearBtn="false" />
+ <ExInput :label="$t('您的邀请码')" :placeholderText="$t('请输入邀请码')" v-model="invitCode" :clearBtn="false" />
<div class="protocol textColor">
<i @click="agreeProt">
<img v-show="agree" src="../../assets/image/login/prot2.png" alt="" />
@@ -143,10 +143,10 @@
// return
// }
// }
- if(this.invitCode ==''){
- this.$toast(this.$t('请输入邀请码'));
- return
- }
+ // if(this.invitCode ==''){
+ // this.$toast(this.$t('请输入邀请码'));
+ // return
+ // }
switch (this.activeIndex) {
case 0:
{
--
Gitblit v1.9.3