From c8d00cbee0d52733c594bb1212efe18c4dccec9e Mon Sep 17 00:00:00 2001 From: luyisha Date: Tue, 30 May 2023 17:06:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/serve/index.js | 2 +- i18n/lang/de.json | 3 ++- i18n/lang/en.json | 3 ++- i18n/lang/fra.json | 3 ++- i18n/lang/it.json | 3 ++- i18n/lang/jp.json | 3 ++- i18n/lang/kor.json | 3 ++- i18n/lang/pt.json | 3 ++- i18n/lang/spa.json | 3 ++- i18n/lang/tr.json | 3 ++- i18n/lang/zh-TW.json | 3 ++- pages/base/home.vue | 15 +++++++++++++-- pages/purchase/index.vue | 24 ++++++++++++++++++++---- 13 files changed, 54 insertions(+), 17 deletions(-) diff --git a/api/serve/index.js b/api/serve/index.js index c2783f4..47b5df0 100644 --- a/api/serve/index.js +++ b/api/serve/index.js @@ -86,7 +86,7 @@ x.fn = x.prototype = { if(Cache.get(newMsg).data){ if(newMsg!='_user_walletImage'&& newMsg!='_user_getAuthInfo' && newMsg!='_user_withdrawalBalance' && newMsg!='_wallet_getBalance' && newMsg!='_contract_getMarketInfo'&& newMsg!='_contract_openNum' - && newMsg!='_user_primaryAuth' + && newMsg!='_user_primaryAuth' && newMsg!='_user_subscribeTokenList' && newMsg!='_user_subscribeRecords' && newMsg!='_indexList'&& newMsg!='_user_subscribe'&& newMsg!='_contract_getSymbolDetail' && newMsg!='_user_withdrawalRecord'){ resolve(Cache.get(newMsg).data); diff --git a/i18n/lang/de.json b/i18n/lang/de.json index 9f515a7..53840ae 100644 --- a/i18n/lang/de.json +++ b/i18n/lang/de.json @@ -360,7 +360,8 @@ "b6": "Details des Projekts", "b7": "Verwenden oder nicht", "b8": "Kauf", - "b9": "Erfolgreicher Kauf" + "b9": "Erfolgreicher Kauf", + "availableBalance":"Verfügbarer Saldo" }, "reg": { "a0": "Registrieren Sie Ihr Telefon", diff --git a/i18n/lang/en.json b/i18n/lang/en.json index ecf45f7..cb47acf 100644 --- a/i18n/lang/en.json +++ b/i18n/lang/en.json @@ -410,7 +410,8 @@ "b6": "Project Details", "b7": "Whether to use", "b8": "Buy", - "b9": "Subscription is successful" + "b9": "Subscription is successful", + "availableBalance":"Available" }, "reg": { "a0": "Mobile registration", diff --git a/i18n/lang/fra.json b/i18n/lang/fra.json index 4ee4926..f12465f 100644 --- a/i18n/lang/fra.json +++ b/i18n/lang/fra.json @@ -360,7 +360,8 @@ "b6": "Détails du projet", "b7": "Oui Non", "b8": "Achats", - "b9": "Souscription réussie" + "b9": "Souscription réussie", + "availableBalance":"Solde disponible" }, "reg": { "a0": "Enregistrement mobile", diff --git a/i18n/lang/it.json b/i18n/lang/it.json index de860ba..0889a6f 100644 --- a/i18n/lang/it.json +++ b/i18n/lang/it.json @@ -360,7 +360,8 @@ "b6": "Dettagli del progetto", "b7": "Uso o no", "b8": "acquisto", - "b9": "Acquisto riuscito" + "b9": "Acquisto riuscito", + "availableBalance":"Bilancio disponibile" }, "reg": { "a0": "Registrazione mobile", diff --git a/i18n/lang/jp.json b/i18n/lang/jp.json index 99dc429..9518bac 100644 --- a/i18n/lang/jp.json +++ b/i18n/lang/jp.json @@ -360,7 +360,8 @@ "b6": "プロジェクトの詳細", "b7": "使用するかどうか", "b8": "買います", - "b9": "申し込み成功" + "b9": "申し込み成功", + "availableBalance":"利用可能残高" }, "reg": { "a0": "携帯電話の登録", diff --git a/i18n/lang/kor.json b/i18n/lang/kor.json index 0016b75..b806687 100644 --- a/i18n/lang/kor.json +++ b/i18n/lang/kor.json @@ -360,7 +360,8 @@ "b6":"프로젝트 정보", "b7":"사용 여부", "b8":"구입 하 다.", - "b9":"구 매 신청 성공" + "b9":"구 매 신청 성공", + "availableBalance":"사용 가능 잔액" }, "reg": { "a0":"휴대폰 등록", diff --git a/i18n/lang/pt.json b/i18n/lang/pt.json index e23843d..77e4647 100644 --- a/i18n/lang/pt.json +++ b/i18n/lang/pt.json @@ -360,7 +360,8 @@ "b6":"Detalhes do projecto", "b7":"Utilização ou não", "b8":"Compra", - "b9":"Compra BEM sucedida" + "b9":"Compra BEM sucedida", + "availableBalance":"Saldo disponível" }, "reg": { "a0":"Registo móvel", diff --git a/i18n/lang/spa.json b/i18n/lang/spa.json index c5244cd..6b84383 100644 --- a/i18n/lang/spa.json +++ b/i18n/lang/spa.json @@ -360,7 +360,8 @@ "b6":"Detalles del proyecto", "b7":"Usar o no", "b8":"Comprar", - "b9":"éxito de la compra" + "b9":"éxito de la compra", + "availableBalance":"Saldo disponible" }, "reg": { "a0":"Registro de teléfonos móviles", diff --git a/i18n/lang/tr.json b/i18n/lang/tr.json index 66d9fc3..e29497a 100644 --- a/i18n/lang/tr.json +++ b/i18n/lang/tr.json @@ -360,7 +360,8 @@ "b6": "Proje Ayrıntıları", "b7": "Kullanılıp kullanılmayacağı", "b8": "Satın Al", - "b9": "Abonelik başarılı" + "b9": "Abonelik başarılı", + "availableBalance":"Kalan bakiye" }, "reg": { "a0": "Mobil kayıt", diff --git a/i18n/lang/zh-TW.json b/i18n/lang/zh-TW.json index d28c972..25242b5 100644 --- a/i18n/lang/zh-TW.json +++ b/i18n/lang/zh-TW.json @@ -410,7 +410,8 @@ "b6": "項目詳情", "b7": "是否使用", "b8": "購買", - "b9": "申購成功" + "b9": "申購成功", + "availableBalance":"可用餘額" }, "reg": { "a0": "手機註冊", diff --git a/pages/base/home.vue b/pages/base/home.vue index 2cc897b..43b7f49 100644 --- a/pages/base/home.vue +++ b/pages/base/home.vue @@ -239,8 +239,8 @@ - - {{$t("xtzcoins3.a1")}} + {{$t("xtzcoins3.a1")}} + {{$t("xtzcoins3.a2")}} @@ -1030,6 +1030,17 @@ this.detail = res.data }) }, + toRecharge(){ + if(!this.detail.primary_status){ + uni.navigateTo({ + url: "/pages/auth/primary" + }) + return; + } + uni.navigateTo({ + url: "/pages/assets/recharge" + }) + } }, mounted() { this.getCollegeList() diff --git a/pages/purchase/index.vue b/pages/purchase/index.vue index ee7f89b..621820f 100644 --- a/pages/purchase/index.vue +++ b/pages/purchase/index.vue @@ -105,9 +105,8 @@ - {{ num || 1 }} {{ activeCoin.coin_name }} ≈ - - {{ omitTo((1 / detail.issue_price * activeCoin.CurrentPrice * num), 4) }} + {{ 1 }} {{ activeCoin.coin_name }} ≈ + {{ omitTo((1 / detail.issue_price * activeCoin.CurrentPrice * 1), 4) }} {{ detail.coin_name }} @@ -117,11 +116,18 @@ + + + {{ num }} {{ activeCoin.coin_name }} ≈ + {{ omitTo((1 / detail.issue_price * activeCoin.CurrentPrice * num), 4) }} + {{ detail.coin_name }} + + {{ $t("purchase.a7") }} - +