diff --git a/i18n/lang/en.json b/i18n/lang/en.json index 32135bc..0b0a460 100644 --- a/i18n/lang/en.json +++ b/i18n/lang/en.json @@ -124,10 +124,14 @@ "d40": "The annualized rate does not represent actual or expected returns calculated in fiat currency. Please refer to the product rules for the relevant return mechanism.", "d41": "Returns", "d42": "Returns will be calculated starting from the day after subscription, and interest income will be distributed daily.", - "d43": "After a successful redemption application, the current assets will be immediately returned to your wealth management wallet.", + "d43": "After a successful redemption request, the current account assets will be returned to your investment wallet 24 hours later.", "d44": "Accumulated interest", "d45": "Regular", - "d46": "The selected assets will be redeemed immediately and in full to your financial account." + "d46": "The selected assets will be redeemed immediately and in full to your financial account.", + "d47": "v1-v5 (total 0.025)", + "d48": "Level", + "d49": "Performance", + "d50": "Reward Percentage" }, "base": { "a0": "Title", diff --git a/i18n/lang/zh-TW.json b/i18n/lang/zh-TW.json index ac5e771..3cadc68 100644 --- a/i18n/lang/zh-TW.json +++ b/i18n/lang/zh-TW.json @@ -123,10 +123,14 @@ "d40": "年化率井不代表以法幣計算的實際或預期收益，相關收益機制請參考產品規則。", "d41": "收益", "d42": "申購後第二天開始計算收益，每天分配一次利息收益。", - "d43": "赎回申请成功后，活期的资产立即退回你的理财钱包。", + "d43": "贖回申請成功後，活期的資產將在 24小時後退回你的理財錢包。", "d44": "累計利息", "d45": "定期", - "d46": "所選的資產立即全額贖回至您的理財帳戶。" + "d46": "所選的資產立即全額贖回至您的理財帳戶。", + "d47": "v1-v5(总的0.025)", + "d48": "级别", + "d49": "业绩", + "d50": "奖励比例" }, "base": { "a0": "標題", diff --git a/pages/assets/draw.vue b/pages/assets/draw.vue index 79dccd2..b690777 100644 --- a/pages/assets/draw.vue +++ b/pages/assets/draw.vue @@ -46,6 +46,12 @@ :class="rechargeType==3?'bor-active':'bg-panel-3 border'" >TRC20 + BEP20 + diff --git a/pages/assets/recharge.vue b/pages/assets/recharge.vue index ba56143..be0266a 100644 --- a/pages/assets/recharge.vue +++ b/pages/assets/recharge.vue @@ -32,16 +32,15 @@ @click="changeRechargeType(1)" >OMNI --> - ERC20 - TRC20 + + ERC20 + + + TRC20 + + + BEP20 + diff --git a/pages/financialManagement/finances-product.vue b/pages/financialManagement/finances-product.vue index a5fb7f0..00f4a8b 100644 --- a/pages/financialManagement/finances-product.vue +++ b/pages/financialManagement/finances-product.vue @@ -144,14 +144,35 @@ {{$t('common.d40')}} - + 1、{{$t('common.d41')}} {{$t('common.d42')}} - + 2、{{$t('common.d14')}} {{$t('common.d43')}} + + 2、{{$t('common.d47')}} + + + + + + + + + + + + + + + + +
{{$t('common.d48')}}{{$t('common.d49')}}{{$t('common.d50')}}
{{items.vip}}{{items.money}}{{items.proportion}}
+ + @@ -196,7 +217,14 @@ export default { bool1:1, stopsubscription:false, Subscriptionindex:null, - userinfo:uni.getStorageSync("user") + userinfo:uni.getStorageSync("user"), + tablelist:[ + {"vip":"v1","money":"10000","proportion":"20%"}, + {"vip":"v2","money":"100000","proportion":"40%"}, + {"vip":"v3","money":"300000","proportion":"60%"}, + {"vip":"v4","money":"1000000","proportion":"80%"}, + {"vip":"v5","money":"10000000","proportion":"100%"} + ] }; }, methods: { diff --git a/pages/financialManagement/index.vue b/pages/financialManagement/index.vue index 6c1e775..677857a 100644 --- a/pages/financialManagement/index.vue +++ b/pages/financialManagement/index.vue @@ -8,70 +8,74 @@
- - {{$t('common.d23')}} - - - - - - - - - - {{ filterMoney(activeCoin.usable_balance) }} - USDT - - + - {{$t('common.d24')}} - $ {{activeCoin.yesterdayAmount}} - - - {{$t('common.d25')}} - $ {{activeCoin.businessAmount}} - - - {{$t('common.d26')}} - $ {{activeCoin.totalAmount}} - - - - - - VIP {{vip.level}} - - - {{vip.level==5?$t('common.grade'):$t('common.distance')}} VIP{{nextVip.level}} - - - {{financial.performance}} - {{nextVip.performance}} + + {{$t('common.d23')}} + + + + + + + + + + {{ filterMoney(activeCoin.usable_balance) }} + USDT + + + + {{$t('common.d24')}} + $ {{activeCoin.yesterdayAmount}} + + + {{$t('common.d25')}} + $ {{activeCoin.businessAmount}} + + + {{$t('common.d26')}} + $ {{activeCoin.totalAmount}} + + + + + + VIP {{vip.level}} + + + {{vip.level==5?$t('common.grade'):$t('common.distance')}} VIP{{nextVip.level}} + + + {{financial.performance}} + {{nextVip.performance}} + + + + + {{$t('common.d12')}} + {{$t('common.d14')}} + + + + + {{item.coin_name}} + + + {{$t("common.d9")}} + {{item.rate}}%{{$t('exchange.e3')}} + + + {{$t("common.d10")}} + {{$t('common.d16')}} + + + {{$t("common.d44")}} + {{item.cumulativeIncome}} + - - - {{$t('common.d12')}} - {{$t('common.d14')}} - - - - - {{item.coin_name}} - - - {{$t("common.d9")}} - {{item.rate}}%{{$t('exchange.e3')}} - - - {{$t("common.d10")}} - {{$t('common.d16')}} - - - {{$t("common.d44")}} - {{item.cumulativeIncome}} - - +
@@ -108,7 +112,8 @@ coin_name1:"USDT", financial:{}, vip:{}, - nextVip:{} + nextVip:{}, + refreshing: false, }; }, watch:{ @@ -131,6 +136,15 @@ if (this.hideMoney1) return "******"; return val; }, + refresherscroll(){ + this.getBalance() + this.init() + if (this.refreshing) return; + this.refreshing = true; + setTimeout(() => { + this.refreshing = false; + }, 1000) + }, getBalance(){ let data = { account: 4,