From 1404c1d63b0f0462acdf4bf7ff21a4a663e1a1d1 Mon Sep 17 00:00:00 2001 From: ltlzx <942659938@qq.com> Date: Mon, 14 Feb 2022 14:01:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A32022.02.14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SecondaryNav.vue | 9 +- src/i18n/en.json | 5 +- src/i18n/tw.json | 5 +- src/views/contract/hold-position.vue | 267 ++++++++++++++------------- src/views/contract/index.vue | 26 +-- src/views/profile/certification.vue | 140 ++++++++------ src/views/profile/index.vue | 53 +++--- 7 files changed, 271 insertions(+), 234 deletions(-) diff --git a/src/components/SecondaryNav.vue b/src/components/SecondaryNav.vue index 60128ff..3adaecb 100644 --- a/src/components/SecondaryNav.vue +++ b/src/components/SecondaryNav.vue @@ -65,10 +65,11 @@ export default { }, { url: `/profile/certification`, label: this.$t('common.auth') - }, { - url: `/profile/invite`, - label: this.$t('common.invitationReward') - }, + }, + // { + // url: `/profile/invite`, + // label: this.$t('common.invitationReward') + // }, // { // url: `/profile/login-history`, // label: this.$t('common.visitHistory') diff --git a/src/i18n/en.json b/src/i18n/en.json index bd32bd8..e937bda 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -683,6 +683,9 @@ "buyLevel": "equal" }, "profile": { + "tips":"Withdrawal quota. For more withdrawal quota, please complete advanced certification.", + "SelectAreaCode":"Select area code", + "driverLicense":"Driver's license", "country":"Country", "country1":"Please enter your country", "realName": "Real Name Authentication", @@ -739,7 +742,7 @@ "userInfo": "Account Information", "verState": "Verification State", "max": "Max", - "limitH": "Hourly withdrawal limit", + "limitH": "Hourly withdrawal limit.", "verLeave": "Verification Level", "exceed": "Exceed", "contactUs": "Contact Us", diff --git a/src/i18n/tw.json b/src/i18n/tw.json index cdf15f9..eaafff4 100644 --- a/src/i18n/tw.json +++ b/src/i18n/tw.json @@ -622,6 +622,9 @@ "buyLevel": "買平" }, "profile": { + "tips":"提幣限額，如需更多提幣額度，請完成⾼級認證", + "SelectAreaCode":"選擇區號", + "driverLicense":"駕駛證", "country":"國家", "country1":"請輸入國家", "realName": "實名認證", @@ -678,7 +681,7 @@ "userInfo": "帳戶資訊", "verState": "驗證狀態", "max": "最大", - "limitH": "小時提幣限額", + "limitH": "小時提幣限額。", "verLeave": "驗證級別", "exceed": "超過", "contactUs": "聯繫我們", diff --git a/src/views/contract/hold-position.vue b/src/views/contract/hold-position.vue index 806f60e..68de194 100644 --- a/src/views/contract/hold-position.vue +++ b/src/views/contract/hold-position.vue @@ -89,111 +89,111 @@ -
[], - type: Array, - required: false, + default: () => [], + type: Array, + required: false, }, newPrice: { - default: 0, - type: Number, - required: false, + default: 0, + type: Number, + required: false, }, holdPositionAll: { - default: false, - type: Boolean, + default: false, + type: Boolean, }, symbolDetail: { - default: () => {}, - type: Object, + default: () => {}, + type: Object, }, }, computed: { showList() { - return this.holdPositionList.filter((item) => item.hold_position); + return this.holdPositionList.filter((item) => item.hold_position); }, activeStep() { - if (!this.form.amount || !this.activeItem.avail_position) return 0; - let num = (this.form.amount / this.activeItem.avail_position) * 100; - return num; + // return 0 + if (!this.form.amount || !this.activeItem.avail_position) return 100; + let num = (this.form.amount / this.activeItem.avail_position) * 100; + return num; }, }, data() { return { - list: [], - activeItem: {}, - form: { - entrust_price: "", - amount: "", - }, - strategyForm: { - symbol: "", - position_side: "", - tp_trigger_price: "", - sl_trigger_price: "", - }, + list: [], + activeItem: {}, + form: { + entrust_price: "", + amount: "", + }, + strategyForm: { + symbol: "", + position_side: "", + tp_trigger_price: "", + sl_trigger_price: "", + }, }; }, watch: {}, @@ -530,10 +531,10 @@ export default { }, // 平仓弹窗 liquidation(item) { - this.activeItem = item; - this.form.entrust_price = this.newPrice; - this.$set(this.activeItem, "closeType", 1); - $("#exampleModal").modal("show"); + this.activeItem = item; + this.form.entrust_price = this.newPrice; + this.$set(this.activeItem, "closeType", 1); + $("#exampleModal").modal("show"); }, closePosition() { let data = { @@ -619,4 +620,4 @@ export default { } }, }; - \ No newline at end of file + diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue index e8c7eea..1346269 100644 --- a/src/views/contract/index.vue +++ b/src/views/contract/index.vue @@ -143,18 +143,18 @@ />
\ No newline at end of file + diff --git a/src/views/profile/certification.vue b/src/views/profile/certification.vue index 57890dc..c20c072 100644 --- a/src/views/profile/certification.vue +++ b/src/views/profile/certification.vue @@ -95,37 +95,51 @@ />
-
- - -
+
{{$t('profile.contactInformation')}}
-
- -
- - - - {{item.country_code}}（{{item.name}}） - - - -
-
+ + + +
+ + + + + +
+ +
+ + +
+
- + -->
@@ -277,17 +291,25 @@ export default { }, computed: { country() { - return ( - this.countryList.find(item => item.id == this.form.country_id) || {} - ); + return ( + this.countryList.find(item => item.id == this.form.country_id) || {} + ); }, cardType() { - return [ - { - label: this.$t("profile.iD"), - value: 1 - } - ]; + return [ + { + label: this.$t("profile.iD"), + value: 1, + }, + { + label: this.$t("profile.driverLicense"), + value: 2, + }, + { + label: this.$t("profile.passport"), + value: 3, + }, + ]; } }, methods: { @@ -310,25 +332,31 @@ export default { }, // 获取区号列表 getCountryCode() { - Member.getCountryCode() - .then(res => { - this.countryList = res; - this.form.country_id = this.countryList[0].id; - }) - .catch(res => {}); + Member.getCountryCode().then(res => { + this.countryList = res; + for(let i=0; i {}); }, // 初级认证 primaryAuth() { - let data = this.form; - data.country_code = this.country.country_code; - if (utils.validate("#auth")) { - Profile.primaryAuth(data) - .then(res => { - this.$message.success(this.$t("profile.preliminary")); - this.setp++; - }) - .catch(err => {}); - } + let data = this.form; + data.country_code = this.country.country_code; + if (utils.validate("#auth")) { + Profile.primaryAuth(data) + .then(res => { + this.$message.success(this.$t("profile.preliminary")); + // this.setp++; + this.$router.push("/wallet/assets/exchange") + }) + .catch(err => {}); + } }, // 高级认证 topAuth() { diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue index ed9ea3d..eec66ea 100644 --- a/src/views/profile/index.vue +++ b/src/views/profile/index.vue @@ -21,11 +21,12 @@
- {{$t('profile.max')}} - 20k - USD - 24 - {{$t('profile.limitH')}} + {{$t('profile.max')}} + 1k + USD + 24 + {{$t('profile.limitH')}} + {{$t('profile.tips')}}
@@ -81,16 +82,16 @@
-
- -
-
{{$t('profile.inviteFriends')}}
-
-
{{$t('profile.dividends',{name:'AMATAK',num:'30%'})}}
- -
-
-
+
@@ -101,16 +102,16 @@
-
- -
-
{{$t('profile.registrationDecord')}}
-
-
{{$t('profile.recording')}}。
- -
-
-
+ @@ -145,4 +146,4 @@ export default { \ No newline at end of file +