From 1136b8d80116008cc1f8da51f0f53dc746d52f86 Mon Sep 17 00:00:00 2001
From: 李凌 <344137771@qq.com>
Date: Sun, 12 Oct 2025 15:41:09 +0800
Subject: [PATCH] 1
---
src/i18n/Deutsch.js | 3 +
src/i18n/Portuguese.js | 3 +
src/components/Transform/perpetual-position-list/index.vue | 17 +++--
src/i18n/th.js | 3 +
src/views/register/finish.vue | 3
src/views/my/assets.vue | 16 +++--
src/i18n/Italy.js | 3 +
src/i18n/Japanese.js | 3 +
src/i18n/vi.js | 3 +
src/views/register/identity.vue | 9 ++-
src/views/cryptos/PerpetualContract/orderDetail.vue | 4
src/i18n/en.js | 7 +
src/i18n/zhcn.js | 2
src/views/cryptos/PerpetualContract/perpetualHistory.vue | 2
src/i18n/Spanish.js | 7 +
src/i18n/korean.js | 3 +
src/views/cryptos/Recharge/rechargeDetail.vue | 2
src/views/register/step.vue | 6 +-
src/views/my/index.vue | 4
src/i18n/fa.js | 3 +
src/views/cryptos/AccountChange/index.vue | 2
src/i18n/cn.js | 3 +
src/views/register/index.vue | 32 ++++++----
src/views/cryptos/Recharge/rechargePage.vue | 12 ++--
src/components/Transform/perpetual-open/index.vue | 2
25 files changed, 103 insertions(+), 51 deletions(-)
diff --git a/src/components/Transform/perpetual-open/index.vue b/src/components/Transform/perpetual-open/index.vue
index faa954a..9bbe549 100644
--- a/src/components/Transform/perpetual-open/index.vue
+++ b/src/components/Transform/perpetual-open/index.vue
@@ -594,7 +594,7 @@
queryType: 'cryptos',
assetObj: {}, // 总资产估值数据对象
locationList: [
- { title: this.$t('逐仓'), type: 0 },
+ // { title: this.$t('逐仓'), type: 0 },
{ title: this.$t('全仓'), type: 1 },
],
locationShow: false,
diff --git a/src/components/Transform/perpetual-position-list/index.vue b/src/components/Transform/perpetual-position-list/index.vue
index 0207f3c..6f6d1bf 100644
--- a/src/components/Transform/perpetual-position-list/index.vue
+++ b/src/components/Transform/perpetual-position-list/index.vue
@@ -29,7 +29,7 @@
</div>
</div>
</div>
- <div class="flex justify-between font-28">
+ <!-- <div class="flex justify-between font-28">
<div class="flex-1">
<div class="text-grey">{{ routeType == 'cryptos' ? $t('未实现盈亏（USDT）') : $t('未实现盈亏（USD）') }}</div>
<div class="mt-20" :class="item.profit > 0 ? 'text-green' : 'text-red'">
@@ -46,23 +46,28 @@
<button class="font-30 detail-btn border-light-blue greyBg colorMain w-125 h-60" @click="goDetail(item)">{{
$t('详情') }}</button>
</div>
- </div>
+ </div> -->
<div class="flex pt-44 pb-32 font-28">
<div class="flex-1">
<div class="text-grey">{{ $t('持仓数量') }}</div>
- <div class="mt-20 textColor">{{ reserve(item.volume / (item.lever_rate ? item.lever_rate : 1),4) }}*{{
+ <div class="mt-20 textColor">{{ reserve(item.volume / (item.lever_rate ? item.lever_rate : 1), 4) }}*{{
item.lever_rate ? item.lever_rate : 1 }}x</div>
</div>
<div class="flex-1 text-center font-28">
<div class="text-grey">{{ $t('交易金额') }} ( {{ routeType == 'cryptos' ? 'USDT' : 'USD' }})</div>
<div class="mt-20 textColor">{{ item.deposit }}</div>
</div>
- <div class="flex-1 flex flex-col items-end font-28">
+ <!-- <div class="flex-1 flex flex-col items-end font-28">
<div class="text-grey">{{ $t('开仓价格') }}</div>
<div class="mt-20 textColor">{{ item.trade_avg_price }}</div>
+ </div> -->
+ <div class="flex-1 flex flex-col items-end justify-end">
+ <button class="greyBg textColor border-none pl-34 pr-34 pt-10 pb-10 rounded-ban"
+ @click="onSell(item.order_no)">
+ {{ $t('平仓') }}</button>
</div>
</div>
- <div class="flex pb-32 font-28">
+ <!-- <div class="flex pb-32 font-28">
<div class="flex-1">
<div class="text-grey">{{ $t('标记价格') }}</div>
<div class="mt-20 textColor">{{ item.mark_price }}</div>
@@ -76,7 +81,7 @@
@click="onSell(item.order_no)">
{{ $t('平仓') }}</button>
</div>
- </div>
+ </div> -->
<!-- <div class="flex pb-32 font-28">
<div class="flex-1 flex flex-col items-center justify-end">
<button class="font-30 detail-btn border-light-blue greyBg colorMain w-125 h-60" @click="goDetail(item)">{{
diff --git a/src/i18n/Deutsch.js b/src/i18n/Deutsch.js
index 5a6e8e6..510678a 100644
--- a/src/i18n/Deutsch.js
+++ b/src/i18n/Deutsch.js
@@ -2817,4 +2817,7 @@
"合约历史": "Geschichte des vertrags",
"逐仓": "Isol",
"账号或密码不正确": "Konto oder Passwort ist falsch",
+ "邀请码(必填)": "Einladungscode (Pflichtfeld)",
+ "请输入邀请码": "Bitte geben Sie den Einladungscode ein",
+ "当前持仓": "Aktuelle lagerung",
}
\ No newline at end of file
diff --git a/src/i18n/Italy.js b/src/i18n/Italy.js
index 1e18ea2..180e940 100644
--- a/src/i18n/Italy.js
+++ b/src/i18n/Italy.js
@@ -2906,4 +2906,7 @@
"最多可转": "Non trasferibile",
"合约历史": "Storia dei contratti",
"逐仓": "Per sili",
+ "邀请码(必填)": "Codice di invito (obbligatorio)",
+ "请输入邀请码": "Inserisci il codice di invito",
+ "当前持仓": "Posizione attuale",
}
\ No newline at end of file
diff --git a/src/i18n/Japanese.js b/src/i18n/Japanese.js
index 5597f36..7b735f2 100644
--- a/src/i18n/Japanese.js
+++ b/src/i18n/Japanese.js
@@ -2674,4 +2674,7 @@
"最多可转": "回す ことができます",
"合约历史": "契約履歴です",
"逐仓": "倉を逐います",
+ "邀请码(必填)": "紹介コード（必須）です",
+ "请输入邀请码": "紹介コードを入力してください",
+ "当前持仓": "現在のポジションです",
}
\ No newline at end of file
diff --git a/src/i18n/Portuguese.js b/src/i18n/Portuguese.js
index c6c72ea..f07aa4d 100644
--- a/src/i18n/Portuguese.js
+++ b/src/i18n/Portuguese.js
@@ -627,4 +627,7 @@
"合约历史": "Histórico de contratos",
"逐仓": "Cada cápsula",
"账号或密码不正确": "Conta ou senha incorreta",
+ "邀请码(必填)": "Código de convite (obrigatório)",
+ "请输入邀请码": "Por favor, insira o código de convite",
+ "当前持仓": "Posição atual",
}
\ No newline at end of file
diff --git a/src/i18n/Spanish.js b/src/i18n/Spanish.js
index 534f636..af8b713 100644
--- a/src/i18n/Spanish.js
+++ b/src/i18n/Spanish.js
@@ -1826,11 +1826,11 @@
"市价单": "Órdenes de mercado",
"请输入价格": "Por favor ingrese el precio",
"数量(USDT)": "Cantidad de (USDT)",
- "开多": "Más abierto",
+ "开多": "Long",
"看涨": "Ascendido",
"合约金额": "Importe del contrato",
"保证金": "Margen ",
- "开空": "Abierto Corto",
+ "开空": "Short",
"看跌": "Esperar que bajen los precios",
"当前委托": "Comisiones actuales",
"持有仓位": "Puestos ocupados",
@@ -2590,4 +2590,7 @@
"合约历史": "Historial de contratos",
"逐仓": "En cubierta",
"账号或密码不正确": "Nombre de usuario o contraseña incorrectos",
+ "邀请码(必填)": "Código de invitación (obligatorio)",
+ "请输入邀请码": "Por favor ingrese el código de invitación",
+ "当前持仓": "Posición actual",
}
\ No newline at end of file
diff --git a/src/i18n/cn.js b/src/i18n/cn.js
index 4fd617c..593a0b5 100644
--- a/src/i18n/cn.js
+++ b/src/i18n/cn.js
@@ -2795,4 +2795,7 @@
"最多可转": "最多可轉",
"合约历史": "合約歷史",
"逐仓": "逐倉",
+ "邀请码(必填)": "邀請碼(必填)",
+ "请输入邀请码": "請輸入邀請碼",
+ "当前持仓": "當前持倉",
}
diff --git a/src/i18n/en.js b/src/i18n/en.js
index a80b8a3..f8db189 100644
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -1837,11 +1837,11 @@
"市价单": "Market",
"请输入价格": "Please enter Price",
"数量(USDT)": "Amount",
- "开多": "Buy Long",
+ "开多": "Long",
"看涨": "Buy",
"合约金额": "Futures Amount",
"保证金": "Margin",
- "开空": "Buy Short",
+ "开空": "Short",
"看跌": "Sell",
"当前委托": "Open orders",
"持有仓位": "Hold position",
@@ -2770,4 +2770,7 @@
"最多可转": "Up to transferable",
"合约历史": "Contract history",
"逐仓": "Warehouse by warehouse",
+ "邀请码(必填)": "Invitation code (required)",
+ "请输入邀请码": "Please enter the invitation code",
+ "当前持仓": "Current position",
}
\ No newline at end of file
diff --git a/src/i18n/fa.js b/src/i18n/fa.js
index 453e1c1..af37d5a 100644
--- a/src/i18n/fa.js
+++ b/src/i18n/fa.js
@@ -2714,4 +2714,7 @@
"合约历史": "Historique des contrats",
"逐仓": "Chaque silo",
"账号或密码不正确": "Le compte ou le mot de passe est incorrect",
+ "邀请码(必填)": "Code d'invitation (obligatoire)",
+ "请输入邀请码": "Veuillez entrer le code d'invitation",
+ "当前持仓": "Position actuelle",
}
\ No newline at end of file
diff --git a/src/i18n/korean.js b/src/i18n/korean.js
index 24cbe20..4275cc8 100644
--- a/src/i18n/korean.js
+++ b/src/i18n/korean.js
@@ -2810,4 +2810,7 @@
"最多可转": "최대 전환 가능",
"合约历史": "계약 내역",
"逐仓": "창을",
+ "邀请码(必填)": "초대 코드(필수)",
+ "请输入邀请码": "초대 코드를 입력하십시오",
+ "当前持仓": "현재 보유",
}
\ No newline at end of file
diff --git a/src/i18n/th.js b/src/i18n/th.js
index aab042e..33d037e 100644
--- a/src/i18n/th.js
+++ b/src/i18n/th.js
@@ -2782,4 +2782,7 @@
"合约历史": "ประวัติการทำงาน",
"逐仓": "นาที",
"账号或密码不正确": "ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง",
+ "邀请码(必填)": "รหัสแนะนำ (จำเป็นต้องกรอก)",
+ "请输入邀请码": "กรุณาใส่รหัสแนะนำ",
+ "当前持仓": "ตำแหน่งที่จัดเก็บปัจจุบัน",
}
\ No newline at end of file
diff --git a/src/i18n/vi.js b/src/i18n/vi.js
index b75f8a6..f0dc431 100644
--- a/src/i18n/vi.js
+++ b/src/i18n/vi.js
@@ -2761,4 +2761,7 @@
"合约历史": "Lịch sử hợp đồng",
"逐仓": "Từng ngân thương",
"账号或密码不正确": "Tài khoản hoặc mật khẩu không chính xác",
+ "邀请码(必填)": "Mã giới thiệu (bắt buộc)",
+ "请输入邀请码": "Vui lòng nhập mã giới thiệu",
+ "当前持仓": "Hiện tại đang giữ",
}
\ No newline at end of file
diff --git a/src/i18n/zhcn.js b/src/i18n/zhcn.js
index 4f2853c..4dc9bf6 100644
--- a/src/i18n/zhcn.js
+++ b/src/i18n/zhcn.js
@@ -2775,4 +2775,6 @@
"最多可转": "最多可转",
"合约历史": "合约历史",
"逐仓": "逐仓",
+ "请输入邀请码": "请输入邀请码",
+ "当前持仓": "当前持仓",
}
\ No newline at end of file
diff --git a/src/views/cryptos/AccountChange/index.vue b/src/views/cryptos/AccountChange/index.vue
index ea3bf60..3fcbc1f 100644
--- a/src/views/cryptos/AccountChange/index.vue
+++ b/src/views/cryptos/AccountChange/index.vue
@@ -13,7 +13,7 @@
<img v-else src="@/assets/image/assets-center/out.png" class="w-44 h-44 mr-20" /> -->
<div>
<div class="font-32 textColor">{{ category[item.category] }}</div>
- <div class="text-grey font-26 mt-6">{{ item.createTime }}(UTC+2)</div>
+ <div class="text-grey font-26 mt-6">{{ item.createTime }}(UTC-6)</div>
<div class="text-grey font-26 mt-6">{{ orderTypes[item.content_type] }}</div>
</div>
</div>
diff --git a/src/views/cryptos/PerpetualContract/orderDetail.vue b/src/views/cryptos/PerpetualContract/orderDetail.vue
index 5cd648c..123930f 100644
--- a/src/views/cryptos/PerpetualContract/orderDetail.vue
+++ b/src/views/cryptos/PerpetualContract/orderDetail.vue
@@ -49,11 +49,11 @@
</div>
<div class="flex justify-between cell-item">
<div class="text-grey">{{ $t('开仓时间') }}</div>
- <div class="textColor">{{ detail.create_time }}(UTC+2)</div>
+ <div class="textColor">{{ detail.create_time }}(UTC-6)</div>
</div>
<div class="flex justify-between cell-item ">
<div class="text-grey">{{ $t('平仓时间') }}</div>
- <div class="textColor">{{ detail.close_time ? dayjs(detail.close_time * 1000).format('YYYY-MM-DD HH:mm:ss')+'(UTC+2)' :
+ <div class="textColor">{{ detail.close_time ? dayjs(detail.close_time * 1000).format('YYYY-MM-DD HH:mm:ss')+'(UTC-6)' :
'--' }}</div>
</div>
</div>
diff --git a/src/views/cryptos/PerpetualContract/perpetualHistory.vue b/src/views/cryptos/PerpetualContract/perpetualHistory.vue
index 60c8932..93852a9 100644
--- a/src/views/cryptos/PerpetualContract/perpetualHistory.vue
+++ b/src/views/cryptos/PerpetualContract/perpetualHistory.vue
@@ -86,7 +86,7 @@
symbol: '',
isAll: false,
selectData: [
- { title: this.$t('当前委托'), type: 'orders' },
+ { title: this.$t('当前持仓'), type: 'orders' },
{ title: this.$t('历史仓位'), type: 'hisorders' },
],
loading: false,
diff --git a/src/views/cryptos/Recharge/rechargeDetail.vue b/src/views/cryptos/Recharge/rechargeDetail.vue
index aabfeac..8410925 100644
--- a/src/views/cryptos/Recharge/rechargeDetail.vue
+++ b/src/views/cryptos/Recharge/rechargeDetail.vue
@@ -52,7 +52,7 @@
<!-- </div>-->
<div class="flex justify-between mb74">
<div class="text-grey">{{ $t('日期') }}</div>
- <div class="textColor">{{ info.create_time }} (UTC+2)</div>
+ <div class="textColor">{{ info.create_time }} (UTC-6)</div>
</div>
<div class="flex justify-between mb74">
<div class="text-grey">{{ $t('备注') }}</div>
diff --git a/src/views/cryptos/Recharge/rechargePage.vue b/src/views/cryptos/Recharge/rechargePage.vue
index 91a1ae5..b06a83f 100644
--- a/src/views/cryptos/Recharge/rechargePage.vue
+++ b/src/views/cryptos/Recharge/rechargePage.vue
@@ -31,7 +31,7 @@
{{ $t('粘贴') }}</div>
</div>
</div> -->
- <div class="mb-20">
+ <!-- <div class="mb-20">
<div class="font-28 textColor">{{ $t('充币数量') }}</div>
<div>
<input v-model="amount" class="input-view w-full font-28 textColor inputBackground"
@@ -53,16 +53,16 @@
<van-uploader accept="image/*" v-model="fileList" multiple :max-count="1"
:before-read="beforeRead" :after-read="afterRead" />
</div>
- </div>
+ </div> -->
</div>
- <div class="hint-box">
+ <!-- <div class="hint-box">
<div class="pl-30 pr-30">
- <!-- <div class="font-30 mb-27 textColor">{{ $t('重要提示') }}</div> -->
- <!-- <div class="font-28 text-grey" v-html="tip"></div> -->
+ <div class="font-30 mb-27 textColor">{{ $t('重要提示') }}</div>
+ <div class="font-28 text-grey" v-html="tip"></div>
<button class="btnMain text-white next-btn font-30 rounded-lg" @click="nextBtn">{{ $t('下一步')
}}</button>
</div>
- </div>
+ </div> -->
</div>
</div>
</template>
diff --git a/src/views/my/assets.vue b/src/views/my/assets.vue
index 69246a1..f214c2c 100644
--- a/src/views/my/assets.vue
+++ b/src/views/my/assets.vue
@@ -6,17 +6,19 @@
<div class="price_box-tit">{{ $t('总资产估值') }}</div>
<div class="price_box-text assets_money font-bold mt-5 flex justify-center items-end">
- {{ currency.currency_symbol }}{{ forexAssets?.money_contract ?
+ <!-- {{ currency.currency_symbol }} -->
+ {{ forexAssets?.money_contract ?
(forexAssets?.money_contract * (currency.rate ?? 0)).toFixed(2) : '0.00' }}
<div class="pricing_jj ml-5">
- {{ pricing }}
+ <!-- {{ pricing }} -->
+ USDT
</div>
- <van-dropdown-menu>
+ <!-- <van-dropdown-menu>
<van-dropdown-item v-model="pricing" :options="pricingList" @change="changePricing">
<div @click="toPage('/cryptos/exchangeRate')" class="text-center">{{ $t('更多') }}</div>
</van-dropdown-item>
- </van-dropdown-menu>
+ </van-dropdown-menu> -->
</div>
<div class="price-bot">
@@ -47,12 +49,12 @@
<div class="flex-1">
</div>
</div>
- <div class="assets_item flex justify-start items-center mt-14 font-bold">
+ <!-- <div class="assets_item flex justify-start items-center mt-14 font-bold">
<div class="icon" style="background-color: #8A90FE;"></div>
<span class="ml-5 flex-1">{{ $t('资金账户') }}</span>
<span class="mr-5">{{ assetObj.capital }}</span>
<van-icon name="arrow" />
- </div>
+ </div> -->
<div class="assets_item flex justify-start items-center mt-14 font-bold">
<div class="icon" style="background-color: #f7b600;"></div>
<span class="ml-5 flex-1">{{ $t('交易账户') }}</span>
@@ -181,7 +183,7 @@
const tabList1 = [
{ key: 1, name: t('充值'), icon: new URL('@/assets/imgs/assets/cz.png', import.meta.url), path: '/cryptos/recharge/rechargeList?isForeign=true' },
{ key: 2, name: t('提现'), icon: new URL('@/assets/imgs/assets/tx.png', import.meta.url), path: '/cryptos/Withdraw/withdrawPage' },
- { key: 3, name: t('划转'), icon: new URL('@/assets/imgs/assets/hz.png', import.meta.url), path: '/my/transfer' },
+ { key: 3, name: t('闪兑'), icon: new URL('@/assets/imgs/assets/hz.png', import.meta.url), path: '/cryptos/exchangePage' },
]
// 计价切换
diff --git a/src/views/my/index.vue b/src/views/my/index.vue
index 5a77d3e..d09b627 100644
--- a/src/views/my/index.vue
+++ b/src/views/my/index.vue
@@ -182,8 +182,8 @@
{ icon: new URL('../../assets/image/assets-center/authVerify.png', import.meta.url), title: t('authVerify'), path: '/certificationCenter', show: true },
{ icon: new URL('../../assets/image/assets-center/AdvancedCertification.png', import.meta.url), title: t('高级认证'), path: '/advancedCtf', show: true },
// { icon: 'todo-list-o', title: t('账变记录'), path: '/cryptos/accountChange' },
- { icon: new URL('../../assets/image/assets-center/valuation.png', import.meta.url), title: t('计价方式'), path: '/cryptos/exchangeRate' },
- { icon: new URL('../../assets/image/assets-center/AddPaymentMethod.png', import.meta.url), title: t('AddPaymentMethod'), path: '/payMentMethod/list' },
+ // { icon: new URL('../../assets/image/assets-center/valuation.png', import.meta.url), title: t('计价方式'), path: '/cryptos/exchangeRate' },
+ // { icon: new URL('../../assets/image/assets-center/AddPaymentMethod.png', import.meta.url), title: t('AddPaymentMethod'), path: '/payMentMethod/list' },
{ icon: new URL('../../assets/image/assets-center/help.png', import.meta.url), title: t('帮助中心'), path: '/helpCenter' },
]
}
diff --git a/src/views/register/finish.vue b/src/views/register/finish.vue
index 225a275..0e97641 100644
--- a/src/views/register/finish.vue
+++ b/src/views/register/finish.vue
@@ -1,6 +1,7 @@
<template>
<div class="finish">
- <Step :step="4"></Step>
+ <!-- <Step :step="4"></Step> -->
+ <Step :step="3"></Step>
<div class="title textColor">{{ $t('registerSuccess') }}</div>
<p class="mt-8 pl-9">
<i @click="agreeInfo">
diff --git a/src/views/register/identity.vue b/src/views/register/identity.vue
index dd37d0b..246e79c 100644
--- a/src/views/register/identity.vue
+++ b/src/views/register/identity.vue
@@ -4,7 +4,8 @@
<div class="header">
<div class="flex items-center" @click="$router.go(-1)"><img
src="../../assets/image/assets-center/left-arrow.png" alt="" class="leftReturn" /></div>
- <div class="textColor" @click="$router.push('/gooleVerify')">{{ $t('skip') }}</div>
+ <!-- <div class="textColor" @click="$router.push('/gooleVerify')">{{ $t('skip') }}</div> -->
+ <div class="textColor" @click="$router.push('/finish')">{{ $t('skip') }}</div>
</div>
<Step :step="2"></Step>
<div class="title textColor">{{ $t('realNameVertify') }}</div>
@@ -205,7 +206,8 @@
return
}
if (status.value !== 0) {
- router.push('/gooleVerify');
+ // router.push('/gooleVerify');
+ router.push('/finish');
} else {
_applyIdentify({
name: name.value,
@@ -216,7 +218,8 @@
countryName: countryCode.value // countryName 存储的 code, 回来再遍历
}).then(() => {
showToast(t('submitSuccess'))
- router.push('/gooleVerify');
+ // router.push('/gooleVerify');
+ router.push('/finish');
//this.fetchInfo()
}).catch(err => {
console.log(err)
diff --git a/src/views/register/index.vue b/src/views/register/index.vue
index 1007bed..38661a8 100644
--- a/src/views/register/index.vue
+++ b/src/views/register/index.vue
@@ -4,20 +4,22 @@
<Step :step="1"></Step>
<div class="title textColor">{{ $t('register') }}</div>
<div class="flex re-tab">
- <div class="text_color" :class="activeIndex == 0 ? 'active' : ''" @click="changeIndex(0)">{{
+ <!-- <div class="text_color" :class="activeIndex == 0 ? 'active' : ''" @click="changeIndex(0)">{{
$t('account')
- }}</div>
- <!-- <div class="textColor" :class="activeIndex == 1 ? 'active' : ''" @click="changeIndex(1)">{{ $t('email') }}
+ }}</div> -->
+ <div class="textColor" :class="activeIndex == 1 ? 'active' : ''" @click="changeIndex(1)">{{ $t('email') }}
</div>
<div class="textColor" :class="activeIndex == 2 ? 'active' : ''" @click="changeIndex(2)">{{
$t('phoneNum')
- }}</div> -->
+ }}</div>
</div>
- <ExInput :label="getRegType(activeIndex, true)" :placeholderText="getRegType(activeIndex, false)" v-model="username"
- :area="isArea" :dialCode="dialCode" @selectArea="onSelectArea" :icon="icon" />
+ <ExInput :label="getRegType(activeIndex, true)" :placeholderText="getRegType(activeIndex, false)"
+ v-model="username" :area="isArea" :dialCode="dialCode" @selectArea="onSelectArea" :icon="icon" />
- <ExInput :label="$t('setPassword')" :placeholderText="$t('passwordTips')" v-model="password" typeText="password" />
- <ExInput :label="$t('repassword')" :placeholderText="$t('surePassword')" v-model="repassword" typeText="password" />
+ <ExInput :label="$t('setPassword')" :placeholderText="$t('passwordTips')" v-model="password"
+ typeText="password" />
+ <ExInput :label="$t('repassword')" :placeholderText="$t('surePassword')" v-model="repassword"
+ typeText="password" />
<ExInput :label="$t('setSafeword')" :placeholderText="$t('safewordTips')" v-model="safeword" typeText="password"
v-if="activeIndex === 1" />
<div class="inputCom" v-if="activeIndex === 1">
@@ -30,7 +32,7 @@
</span>
</div>
</div>
- <ExInput :label="$t('invitCode')" :placeholderText="$t('entryInvitCode')" v-model="invitCode" :clearBtn="false" />
+ <ExInput :label="$t('邀请码(必填)')" :placeholderText="$t('entryInvitCode')" v-model="invitCode" :clearBtn="false" />
<div class="protocol textColor">
<i @click="agreeProt">
<img v-show="agree" src="../../assets/image/login/prot2.png" alt="" />
@@ -38,7 +40,7 @@
</i>
{{ $t('readAgree') }}<span class="colorMain" @click="router.push('/TermsOfService')">{{
$t('serviceConf')
- }}</span>
+ }}</span>
</div>
<van-button class="w-full" style="margin-top:10px;" type="primary" @click="register">{{ $t('register') }}
</van-button>
@@ -90,7 +92,7 @@
const safeword = ref('')
const fundPassword = ref('')
const refundPassword = ref('')
-const activeIndex = ref(0)
+const activeIndex = ref(1)
const typeText = ref('password')
let isArea = ref(false)
let dialCode = ref(0)
@@ -173,7 +175,7 @@
agree.value = !agree.value
}
const register = () => {
- console.log(activeIndex.value,'activeIndex.value')
+ console.log(activeIndex.value, 'activeIndex.value')
if (activeIndex.value == 0) {
if (username.value == '') {
showToast(t('entryAccount'));
@@ -198,7 +200,7 @@
return
}
} else if (activeIndex.value == 2) {
- if(!(/(^[1-9]\d*$)/.test(username.value))){
+ if (!(/(^[1-9]\d*$)/.test(username.value))) {
showToast(t('entryPhone'));
return
}
@@ -219,6 +221,10 @@
showToast(t('noSamePassword'));
return
}
+ if (invitCode.value == '') {
+ showToast(t('请输入邀请码'));
+ return
+ }
if (!agree.value) {
showToast(t('agreeServiceCond'));
return
diff --git a/src/views/register/step.vue b/src/views/register/step.vue
index 185df20..06dc4b4 100644
--- a/src/views/register/step.vue
+++ b/src/views/register/step.vue
@@ -6,13 +6,13 @@
<div class="step" :class="step == 2 || step == 3 || step == 4 ?'green':''">2</div>
<div class="line" :class="step == 3 || step == 4 ?'green':''"></div>
<div class="step" :class="step == 3 || step == 4 ?'green':''">3</div>
- <div class="line" :class="step == 4 ?'green':''"></div>
- <div class="step" :class="step == 4 ?'green':''">4</div>
+ <!-- <div class="line" :class="step == 4 ?'green':''"></div>
+ <div class="step" :class="step == 4 ?'green':''">4</div> -->
</div>
<div class="stepsText textColor">
<div>{{ $t('accountRegister') }}</div>
<div>{{ $t('realNameVertify') }}</div>
- <div>{{ $t('safeBind') }}</div>
+ <!-- <div>{{ $t('safeBind') }}</div> -->
<div>{{ $t('toExchange') }}</div>
</div>
</div>
--
Gitblit v1.9.3