From be54a44884517beddf4eb88fa81763ab14e8757f Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Wed, 04 Sep 2024 22:45:24 +0800
Subject: [PATCH] 9.4问题处理

---
 src/i18n/kor.json           |    1 +
 src/i18n/en.json            |    1 +
 src/i18n/spa.json           |    1 +
 src/i18n/index.js           |    2 +-
 src/i18n/jp.json            |    1 +
 src/page/register/index.vue |   33 +++++++++++++++++----------------
 src/i18n/de.json            |    1 +
 src/i18n/vie.json           |    1 +
 src/i18n/zh.json            |    1 +
 src/i18n/cht.json           |    1 +
 src/i18n/it.json            |    1 +
 src/i18n/th.json            |    1 +
 src/i18n/id.json            |    1 +
 src/i18n/ara.json           |    1 +
 src/i18n/fra.json           |    1 +
 15 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/i18n/ara.json b/src/i18n/ara.json
index 032af10..6d9ff23 100644
--- a/src/i18n/ara.json
+++ b/src/i18n/ara.json
@@ -1,4 +1,5 @@
 {
+	"个性号码":"رقم شخصي",
   "3": "3",
   "期权合约":"عقد الخيار",
   "当前有待处理提现订单,请稍后提现!": "يوجد حاليًا أمر سحب معلق ، يرجى السحب لاحقًا!",
diff --git a/src/i18n/cht.json b/src/i18n/cht.json
index 3dd45ed..be86017 100644
--- a/src/i18n/cht.json
+++ b/src/i18n/cht.json
@@ -1,4 +1,5 @@
 {
+	"个性号码":"個性號碼",
   "3": "3",
   "期权合约":"期權合約",
   "请输入止盈金额": "請輸入止盈金額",
diff --git a/src/i18n/de.json b/src/i18n/de.json
index ff24526..3c8db15 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -1,4 +1,5 @@
 {
+	"个性号码":"Personalisierte Nummer",
   "3": "3",
   "期权合约":"Optionsvertrag",
   "请输入止盈金额": "Bitte geben Sie den Take-Profit-Betrag ein",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index cc2a84f..f877067 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1,4 +1,5 @@
 {
+	"个性号码":"Personalized number",
   "3": "three",
   "期权合约":"Options",
   "请输入止盈金额": "take profit amount",
diff --git a/src/i18n/fra.json b/src/i18n/fra.json
index 8d2e542..14bf766 100644
--- a/src/i18n/fra.json
+++ b/src/i18n/fra.json
@@ -1,4 +1,5 @@
 {
+	"个性号码":"Numéro personnalisé",
   "3": "3",
   "期权合约":"Contrats d'options",
   "请输入止盈金额": "Prendre le montant du profit",
diff --git a/src/i18n/id.json b/src/i18n/id.json
index a96e06c..5adc426 100644
--- a/src/i18n/id.json
+++ b/src/i18n/id.json
@@ -1,4 +1,5 @@
 {
+	"个性号码":"Nomor yang dipersonalisasi",
   "3": "3",
   "期权合约":"Kontrak opsi",
   "请输入止盈金额": "Ambil jumlah keuntungan",
diff --git a/src/i18n/index.js b/src/i18n/index.js
index eab2719..8265d18 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -24,7 +24,7 @@
 Vue.use(VueI18n);
 
 // 获取当前语言(初始化时localStorage里没有存语言,默认为浏览器当前的语言)
-const lang = getStorage("lang") || "en";
+const lang = getStorage("lang") || "zh-CN";
 //const lang = 'zh-CN'
 
 // 组合element ui 和 项目自身的文案文件
diff --git a/src/i18n/it.json b/src/i18n/it.json
index 86d617c..b9efa7d 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -1,4 +1,5 @@
 {
+	"个性号码":"Numero personale",
   "3": "tre",
   "期权合约":"Contratto di opzione",
   "请输入止盈金额": "Prendi l importo del profitto",
diff --git a/src/i18n/jp.json b/src/i18n/jp.json
index 69c37e7..5082c48 100644
--- a/src/i18n/jp.json
+++ b/src/i18n/jp.json
@@ -1,4 +1,5 @@
 {
+	"个性号码":"個人番号",
   "3": "3",
   "期权合约":"オプション契約",
   "请输入止盈金额": "利食い金額",
diff --git a/src/i18n/kor.json b/src/i18n/kor.json
index bfb4dfb..2ed71c1 100644
--- a/src/i18n/kor.json
+++ b/src/i18n/kor.json
@@ -1,4 +1,5 @@
 {
+	"个性号码":"개인 코드",
   "3": "3 ",
   "期权合约":"옵션 계약",
   "请输入止盈金额": "이익실현 금액",
diff --git a/src/i18n/spa.json b/src/i18n/spa.json
index d7d9796..488c8e4 100644
--- a/src/i18n/spa.json
+++ b/src/i18n/spa.json
@@ -1,4 +1,5 @@
 {
+	"个性号码":"código privado",
   "3": "3",
   "期权合约":"Contrato de opción",
   "请输入止盈金额": "Tomar cantidad de ganancias",
diff --git a/src/i18n/th.json b/src/i18n/th.json
index 9250c4c..1aea529 100644
--- a/src/i18n/th.json
+++ b/src/i18n/th.json
@@ -1,4 +1,5 @@
 {
+	"个性号码":"รหัสส่วนตัว",
 	"期权合约":"สัญญาออปชั่น",
   "3": "3",
   "请输入止盈金额": "ขายทำกำไรจำนวน",
diff --git a/src/i18n/vie.json b/src/i18n/vie.json
index 7776ca1..7b9b5a7 100644
--- a/src/i18n/vie.json
+++ b/src/i18n/vie.json
@@ -1,4 +1,5 @@
 {
+	"个性号码":"Mã số cá nhân",
 	"期权合约":"Hợp đồng quyền chọn",
   "3": "3",
   "请输入止盈金额": "Lấy số tiền lãi",
diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index f5bbf0a..fa54e7c 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -1,4 +1,5 @@
 {
+  "个性号码":"个性号码",
   "期权合约":"期权合约",
   "3": "3",
   "中签结果": "中签结果",
diff --git a/src/page/register/index.vue b/src/page/register/index.vue
index 93581b9..d72412f 100644
--- a/src/page/register/index.vue
+++ b/src/page/register/index.vue
@@ -6,7 +6,7 @@
         <div class="title textColor">{{ $t('注册') }}</div>
         <div class="flex re-tab">
 <!--            <div class="textColor1" :class="activeIndex == 0 ? 'active' : ''" @click="changeIndex(0)">{{ $t('账号') }}</div>-->
-            <div class="textColor1" :class="activeIndex == 1 ? 'active' : ''" @click="changeIndex(1)">{{ $t('邮箱') }}</div>
+            <div class="textColor1" :class="activeIndex == 1 ? 'active' : ''" @click="changeIndex(1)">{{ $t('个性号码') }}</div>
              <!-- <div class="textColor1" :class="activeIndex == 2 ? 'active' : ''" @click="changeIndex(2)">{{ $t('手机号') }}</div> -->
         </div>
         <ExInput :label="getRegType(activeIndex, true)" :placeholderText="getRegType(activeIndex, false)" v-model.trim="username"
@@ -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="" />
@@ -96,7 +96,7 @@
                 case 0:
                     return bFlag ? this.$t('账号') : this.$t('请输入账号');
                 case 1:
-                    return bFlag ? this.$t('邮箱') : this.$t('请输入邮箱');
+                    return bFlag ? this.$t('个性号码') : this.$t('个性号码');
                 case 2:
                     return bFlag ? this.$t('手机号') : this.$t('请输入手机号');
             }
@@ -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:
                     {
@@ -161,14 +161,14 @@
                         break;
                     }
                 case 1:
-                    {
-                        let match = this.username.search(/@/);
-                        if (this.username == '' || match == -1) {
-                            this.$toast(this.$t('请输入正确的邮箱地址'));
-                            return;
-                        }
-                        break;
-                    }
+                    // {
+                    //     let match = this.username.search(/@/);
+                    //     if (this.username == '' || match == -1) {
+                    //         this.$toast(this.$t('请输入正确的邮箱地址'));
+                    //         return;
+                    //     }
+                    //     break;
+                    // }
                 case 2:
                     {
                         if (this.username == '') {
@@ -242,7 +242,8 @@
                     this.$router.push('/setFond')
                 }
                 else  {
-                    this.$router.push({ name: 'verify', query: { type: this.activeIndex, account: this.activeIndex == 1 ? this.username : `${this.username}` } })
+					this.$router.push({ name: 'login' })
+                    // this.$router.push({ name: 'verify', query: { type: this.activeIndex, account: this.activeIndex == 1 ? this.username : `${this.username}` } })
                 }
             }).catch((error) => {
                 if (error.code === 'ECONNABORTED') { this.$toast(this.$t('网络超时!')); }

--
Gitblit v1.9.3