diff --git a/pages/menu/token/btc/index.css b/pages/menu/token/btc/index.css index e63a356..f940c4b 100644 --- a/pages/menu/token/btc/index.css +++ b/pages/menu/token/btc/index.css @@ -221,7 +221,14 @@ page{ position: relative; border-radius: 24rpx; } - +.main .money_con4 { + margin-top: 32rpx; + background-image: linear-gradient(to right, #0FB294, #31E2B5); + height: 354rpx; + padding: 40rpx 36rpx; + position: relative; + border-radius: 24rpx; +} .select_con .item1 .rig_con .text1 text { margin-left: 10rpx; } diff --git a/pages/menu/token/btc/index.vue b/pages/menu/token/btc/index.vue index 7ff5bc5..fe36599 100644 --- a/pages/menu/token/btc/index.vue +++ b/pages/menu/token/btc/index.vue @@ -9,7 +9,7 @@ + :class="{'money_con': coin.type=='ETH'&&coin.name!='USDT-ERC20', 'money_con2': coin.type=='BTC', 'money_con3': coin.type=='TRX'&&coin.name!='USDT-TRC20', 'money_con4': coin.name=='USDT-TRC20'||coin.name=='USDT-ERC20'}"> @@ -26,12 +26,14 @@ + v-if="coin.type=='TRX'&&!coin.name=='USDT-TRC20'"> + - + - 0.0 + {{coin.balance}} {{i18n.Existingbalance}} @@ -151,8 +153,8 @@ }, onPullDownRefresh() { this.getWalletInfo(); - this.trxs=[]; - this.pageNum =1; + this.trxs = []; + this.pageNum = 1; setTimeout(function() { uni.stopPullDownRefresh(); }, 500); @@ -253,8 +255,8 @@ if (currency) { this.currency = currency; } - var a=this.$Token.validateTrx('TWgEuYRuXgwfDbcfzZsteu5w5dq1nFR35w'); - console.log(a,123465) + var a = this.$Token.validateTrx('TWgEuYRuXgwfDbcfzZsteu5w5dq1nFR35w'); + console.log(a, 123465) } }; diff --git a/static/tongyonh/img500.png b/static/tongyonh/img500.png index cf4ecff..dfd6b55 100644 Binary files a/static/tongyonh/img500.png and b/static/tongyonh/img500.png differ diff --git a/static/tongyonh/tether_usd.png b/static/tongyonh/tether_usd.png index 4e418d7..dfd6b55 100644 Binary files a/static/tongyonh/tether_usd.png and b/static/tongyonh/tether_usd.png differ diff --git a/static/tongyonh/usdticon.png b/static/tongyonh/usdticon.png new file mode 100644 index 0000000..5a9cd00 Binary files /dev/null and b/static/tongyonh/usdticon.png differ diff --git a/utils/WalletUtil.js b/utils/WalletUtil.js index 704850c..60d2326 100644 --- a/utils/WalletUtil.js +++ b/utils/WalletUtil.js @@ -27,7 +27,7 @@ let fullWallet = { icon: require('@/static/tongyonh/Frame3299.png') }, { - name: "USDT", + name: "USDT-ERC20", xname: 'Tether USD', balance: 0, contractAddress: '0xdac17f958d2ee523a2206206994597c13d831ec7', @@ -46,7 +46,7 @@ let fullWallet = { icon: require('@/static/tongyonh/tron1.png') }, { - name: "USDT", + name: "USDT-TRC20", xname: 'Tether USD', balance: 0, contractAddress: 'TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t', @@ -256,6 +256,10 @@ let WalletUtil = { .coinList[1].balance * usdtU.data.priceInUsd).toFixed(2); wallet.coinList[1].balanceCnyPrice = (wallet .coinList[1].balance * usdtU.data.priceCny).toFixed(2); + if(wallet.coinList[1].name==='USDT') + { + wallet.coinList[1].name='USDT-ERC20' + } break; case 'TRX': // console.log("进来TRX") @@ -277,6 +281,10 @@ let WalletUtil = { }else if (tronCoin.data[i].tokenAbbr === 'USDT') { + if(newList[1].name==='USDT') + { + newList[1].name='USDT-TRC20' + } newList[1].balance = (Number(tronCoin.data[i].balance) / Math.pow(10, tronCoin .data[i].tokenDecimal)); newList[1].tokenType = "trc20" @@ -328,6 +336,7 @@ let WalletUtil = { break; } } + console.log(walletInfo,123456) uni.setStorageSync('walletInfo', walletInfo); uni.setStorageSync('isWallet', false); return wallet; diff --git a/utils/locales/en.js b/utils/locales/en.js index 9478eef..f921bd4 100644 --- a/utils/locales/en.js +++ b/utils/locales/en.js @@ -190,8 +190,8 @@ export default { Importmnemonics: 'Import mnemonics', Mnemonicsimportverification: 'Mnemonics import verification', Language: 'Language', - langfan: 'Traditional Chinese', - langjian: 'Simplified Chinese', + langfan: '繁體中文', + langjian: '简体中文', eng: 'English', edit: 'Edit', Delete: 'Delete', diff --git a/utils/locales/zh-F.js b/utils/locales/zh-F.js index 6d83564..83fdb7b 100644 --- a/utils/locales/zh-F.js +++ b/utils/locales/zh-F.js @@ -190,8 +190,8 @@ export default { Mnemonicsimportverification: '助記詞輸入驗證', Language: '語言', langfan: '繁體中文', - langjian: '簡體中文', - eng: '英文', + langjian: '简体中文', + eng: 'English', edit: '修改', Delete: '删除', DELETE: '删除', diff --git a/utils/locales/zh.js b/utils/locales/zh.js index 2cbd26a..cf887f3 100644 --- a/utils/locales/zh.js +++ b/utils/locales/zh.js @@ -187,9 +187,9 @@ export default { Importmnemonics: '导入助记词', Mnemonicsimportverification: '助记词输入验证', Language: '语言', - langfan: '繁体中文', + langfan: '繁體中文', langjian: '简体中文', - eng: '英文', + eng: 'English', edit: '修改', Delete: '删除', DELETE: '删除',