diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..63b5efb Binary files /dev/null and b/dist.zip differ diff --git a/src/components/CommonHeader.vue b/src/components/CommonHeader.vue index 7c730ca..3e75e03 100644 --- a/src/components/CommonHeader.vue +++ b/src/components/CommonHeader.vue @@ -246,7 +246,7 @@ export default { url: "/purchase" }, learn: { - label: this.$t("common.learn"), + label: this.$t("common.college"), url: "" }, college: { diff --git a/src/i18n/de.json b/src/i18n/de.json index e0d7a89..8eecb0c 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -625,7 +625,8 @@ "profile": { "realName":"Authentifizierung des realen Namens", "primaryCertification":"Primäre Zertifizierung", - "advancedCertification":"Fortgeschrittener Zertifizierungsantrag eingereicht", + "advancedCertification1": "Erweiterter Zertifizierungsantrag", + "advancedCertification2":"Fortgeschrittener Zertifizierungsantrag eingereicht", "toExamine":"zu untersuchen", "fullName":"vollständiger Name", "legal":"legal", diff --git a/src/i18n/en.json b/src/i18n/en.json index e36ed31..3f7adf2 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -692,7 +692,8 @@ "country1":"Please enter your country", "realName": "Real Name Authentication", "primaryCertification": "primary certification", - "advancedCertification": "Submit advanced certification application", + "advancedCertification1": "Advanced Certification Application", + "advancedCertification2": "Submit advanced certification application", "toExamine": "audit", "fullName": "Name", "legal": "Legal", diff --git a/src/i18n/fra.json b/src/i18n/fra.json index d1503f8..de84982 100644 --- a/src/i18n/fra.json +++ b/src/i18n/fra.json @@ -625,7 +625,8 @@ "profile": { "realName":"Authentification par nom réel", "primaryCertification":"Certification primaire", - "advancedCertification":"Demande de certification avancée soumise", + "advancedCertification1": "Demande de certification avancée", + "advancedCertification2":"Demande de certification avancée soumise", "toExamine":"Audit", "fullName":"Nom (s)", "legal":"Statut", diff --git a/src/i18n/it.json b/src/i18n/it.json index ddeec78..0f65ea2 100644 --- a/src/i18n/it.json +++ b/src/i18n/it.json @@ -625,7 +625,8 @@ "profile": { "realName":"Autenticazione del nome reale", "primaryCertification":"Certificazione primaria", - "advancedCertification":"Domanda di certificazione avanzata presentata", + "advancedCertification1": "Domanda di certificazione avanzata", + "advancedCertification2":"Domanda di certificazione avanzata presentata", "toExamine":"da esaminare", "fullName":"nome completo", "legal":"legale", diff --git a/src/i18n/jp.json b/src/i18n/jp.json index dc1e320..24b5ffd 100644 --- a/src/i18n/jp.json +++ b/src/i18n/jp.json @@ -636,7 +636,8 @@ "date":"日付", "address":"場所", "primaryCertification":"ジュニア認証", - "advancedCertification":"高級認証申請はすでに提出されました。", + "advancedCertification1": "高度な認証申請", + "advancedCertification2":"高級認証申請はすでに提出されました。", "toExamine":"審査する", "legal":"法定", "pleaseEnterName":"名前を入力してください", diff --git a/src/i18n/kor.json b/src/i18n/kor.json index 8052f12..1e5dda4 100644 --- a/src/i18n/kor.json +++ b/src/i18n/kor.json @@ -635,7 +635,8 @@ "date":"날짜.", "address":"지점.", "primaryCertification":"초급 인증", - "advancedCertification":"고급 인증 신청 이미 제출", + "advancedCertification1": "고급 인증 신청", + "advancedCertification2":"고급 인증 신청 이미 제출", "toExamine":"심사 하 다.", "legal":"법정.", "pleaseEnterName":"이름 을 입력 하 세 요", diff --git a/src/i18n/pt.json b/src/i18n/pt.json index ba6f8a5..b75737e 100644 --- a/src/i18n/pt.json +++ b/src/i18n/pt.json @@ -625,7 +625,8 @@ "profile": { "realName":"Autenticação do nome real", "primaryCertification":"Certificação primária", - "advancedCertification":"O pedido de certificação avançada foi apresentado", + "advancedCertification1": "Aplicação de Certificação Avançada", + "advancedCertification2":"O pedido de certificação avançada foi apresentado", "toExamine":"auditoria", "fullName":"O nome", "legal":"obrigatória", diff --git a/src/i18n/spa.json b/src/i18n/spa.json index 561d43c..d063940 100644 --- a/src/i18n/spa.json +++ b/src/i18n/spa.json @@ -625,7 +625,8 @@ "profile": { "realName":"Autenticación del nombre real", "primaryCertification":"Certificación primaria", - "advancedCertification":"Solicitud de acreditación avanzada presentada", + "advancedCertification1": "Solicitud de Certificación Avanzada", + "advancedCertification2":"Solicitud de acreditación avanzada presentada", "toExamine":"Auditoría", "fullName":"Nombre", "legal":"Legal", diff --git a/src/i18n/tr.json b/src/i18n/tr.json index 6a3d802..5eea0e9 100644 --- a/src/i18n/tr.json +++ b/src/i18n/tr.json @@ -625,7 +625,8 @@ "profile":{ "realName":"Doğrulandı", "primaryCertification":"Birincil sertifika", - "advancedCertification":"Gelişmiş sertifika başvurusu gönderildi", + "advancedCertification1": "Gelişmiş Sertifikasyon Başvurusu", + "advancedCertification2":"Gelişmiş sertifika başvurusu gönderildi", "toExamine":"Denetim", "fullName":"isim", "legal":"yasal", diff --git a/src/i18n/tw.json b/src/i18n/tw.json index 17bfe83..7aafdb9 100644 --- a/src/i18n/tw.json +++ b/src/i18n/tw.json @@ -630,7 +630,8 @@ "country1":"請輸入國家", "realName": "實名認證", "primaryCertification": "初級認證", - "advancedCertification": "高級認證申請已提交", + "advancedCertification1": "高級認證申請", + "advancedCertification2": "高級認證申請已提交", "toExamine": "稽核", "fullName": "姓名", "legal": "法定", diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 345f420..0b055df 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -98,14 +98,23 @@
${{ item.close }}
-
- -
+
+ + + + + + + +
-
{{ $t("cxiNewText.a21") }}
+
{{ $t("cxiNewText.a21") }}
+
{{ $t("cxiNewText.a21") }}
@@ -156,18 +165,18 @@
{{ $t("cxiNewText.a39") }}
- +
-
+
-
+
-
{{ $t("cxiNewText.a40") }}
IOS & Android
+
{{ $t("cxiNewText.a40") }}
IOS & Android
-
-
APP Store
-
Android APK
+
+
APP Store
+
Android APK
@@ -179,7 +188,8 @@

{{ $t("cxiNewText.a21") }}

-
{{ $t("cxiNewText.a57") }}
+
{{ $t("cxiNewText.a57") }}
+
{{ $t("cxiNewText.a57") }}
@@ -1647,8 +1657,8 @@ path{ .section-block-5{ padding: 40px 0px; .icon-box{ - width: 25%; - margin-right: 20px; + // width: 36%; + // margin-right: 40px; margin-bottom: 40px; text-align: center; img{ diff --git a/src/views/profile/certification.vue b/src/views/profile/certification.vue index 39221f5..c90d1d7 100644 --- a/src/views/profile/certification.vue +++ b/src/views/profile/certification.vue @@ -9,7 +9,7 @@
- +
@@ -378,7 +378,7 @@ export default { } Profile.topAuth(data) .then(res => { - this.$message.success(this.$t("profile.advancedCertification")); + this.$message.success(this.$t("profile.advancedCertification2")); this.getAuthInfo(); }) .catch(err => {}); diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue index 8656f35..aa0fc90 100644 --- a/src/views/wallet/exchange-assets.vue +++ b/src/views/wallet/exchange-assets.vue @@ -142,7 +142,8 @@
- + +
@@ -419,6 +420,7 @@ export default { total_assets_usd: 0 }, userInfo:{},//账户信息 + ProfileDetail: {}, coinAssets: [], // 币种账户 isHideZero: false, // 是否隐藏0余额资产 @@ -603,6 +605,12 @@ export default { // 进入提币 enterWithdraw(item) { + // console.log(this.ProfileDetail.status) + if(this.ProfileDetail.status!=2){ + this.$router.push("/profile/certification"); + return; + } + $('#withdraw').modal('show'); this.withdrawCoin = item.coin_name; this.withdraw.coin_id = item.coin_id; // 查找余额 手续费等信息 @@ -658,6 +666,12 @@ export default { this.userInfo = res }); }, + getAuthInfo() { + Profile.getAuthInfo({}).then(res => { + this.ProfileDetail = res; + console.log(this.ProfileDetail, 11111) + }); + }, // 滚动到页面指定位置 PageScrollTo(num){ document.documentElement.scrollTop = num; @@ -669,7 +683,8 @@ created() { this.getUserAssets(); this.getCoinAssets(); this.createWalletAddress(); - this.getUserInfo() + this.getUserInfo(); + this.getAuthInfo(); }, mounted() { diff --git a/src/views/wallet/funding.vue b/src/views/wallet/funding.vue index 8dc83cb..4ec6e06 100644 --- a/src/views/wallet/funding.vue +++ b/src/views/wallet/funding.vue @@ -40,7 +40,7 @@
-
+
@@ -189,7 +189,10 @@ export default { }, getDepositHistories() { - Wallet.depositHistory().then(data => this.depositHistories = data.data).catch(err => { }); + Wallet.depositHistory().then(data => { + this.depositHistories = data.data; + console.log( this.depositHistories, ' this.depositHistories') + }).catch(err => { }); }, getRechargeManualLog() {