From 254a0b3ba166efca7894460ad04549271c87b4c0 Mon Sep 17 00:00:00 2001 From: Dread <8791926+dread@user.noreply.gitee.com> Date: Thu, 11 Nov 2021 14:43:33 +0800 Subject: [PATCH] =?UTF-8?q?1111=E7=AC=AC=E4=BA=8C=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/menu/backUp/transPaw/index.vue | 15 ++ pages/menu/backUp/transPawKey/index.vue | 3 + .../collection/collectionDetail/index.vue | 8 +- pages/menu/collection/index.vue | 8 +- pages/menu/sendToken/addAddress/index.vue | 6 + pages/menu/sendToken/addAddress2/index.vue | 6 + pages/menu/sendToken/transfer2/index.vue | 6 +- pages/menu/wallet/cwallet/index.vue | 3 + pages/menu/wallet/index.vue | 8 +- pages/menu/wallet/otherCoin/index.css | 18 +- pages/menu/wallet/otherCoin/index.vue | 108 +++++--- unpackage/dist/dev/app-plus/app-service.js | 236 ++++++++++-------- unpackage/dist/dev/app-plus/app-view.js | 164 ++++++------ utils/EthUtil.js | 1 + utils/TokenUtil.js | 6 +- 15 files changed, 360 insertions(+), 236 deletions(-) diff --git a/pages/menu/backUp/transPaw/index.vue b/pages/menu/backUp/transPaw/index.vue index b74b4d4..627926c 100644 --- a/pages/menu/backUp/transPaw/index.vue +++ b/pages/menu/backUp/transPaw/index.vue @@ -75,6 +75,7 @@ this.walletInfo.BTC[0].balance = this.btcBalance this.walletInfo.BTC[0].coinList = [{ name: "BTC", + name2: "BTC", xname: 'Bitcoin', icon: require('@/static/tongyonh/bye.png'), balance: this.btcBalance @@ -83,6 +84,7 @@ this.walletInfo.ETH[0].balance = res this.walletInfo.ETH[0].coinList = [{ name: "ETH", + name2: "ETH", xname: 'Ethereum', icon: require('@/static/tongyonh/Frame3299.png'), balance: res @@ -95,6 +97,7 @@ this.walletInfo.TRON[0].balance = res this.walletInfo.TRON[0].coinList = [{ name: "TRX", + name2: "TRX", xname: 'TRON', icon: require('@/static/tongyonh/tron1.png'), balance: res @@ -104,8 +107,11 @@ console.log(err) }) setTimeout(()=>{ + uni.setStorageSync('ethi', 0); + uni.setStorageSync('itype', true); uni.setStorageSync('walletInfo', this.walletInfo); },1500) + }, // 删除密码触发 @@ -136,6 +142,7 @@ }) btc.coinList = [{ name: "BTC", + name2: "BTC", xname: 'Bitcoin', icon: require('@/static/tongyonh/bye.png'), balance: this.btcBalance @@ -191,6 +198,7 @@ eth.coinList = [{ name: "ETH", + name2: "ETH", xname: 'Ethereum', icon: require('@/static/tongyonh/Frame3299.png'), balance: this.ethBbalance @@ -205,6 +213,11 @@ console.log(this.walletInfo, 44444) setTimeout(()=>{ uni.setStorageSync('walletInfo', this.walletInfo); + // 存一下当前钱包的索引方便后续做 + var e=uni.getStorageSync(ethi) + e+=1 + uni.setStorageSync('ethi', e); + uni.setStorageSync('itype', true); },1000) setTimeout(()=>{ @@ -246,6 +259,7 @@ }) tron.coinList = [{ name: "TRX", + name2: "TRX", xname: 'TRON', icon: require('@/static/tongyonh/tron1.png'), balance: this.trxBbalance @@ -260,6 +274,7 @@ this.walletInfo.TRON[this.$store.state.troni] = tron; setTimeout(()=>{ uni.setStorageSync('walletInfo', this.walletInfo); + },1000) if (this.password != e) { this.info = true; diff --git a/pages/menu/backUp/transPawKey/index.vue b/pages/menu/backUp/transPawKey/index.vue index 506389a..6f333e2 100644 --- a/pages/menu/backUp/transPawKey/index.vue +++ b/pages/menu/backUp/transPawKey/index.vue @@ -84,6 +84,7 @@ btc.password=e; btc.coinList=[{ name:"BTC", + name2:"BTC", xname:'Bitcoin', icon:require('@/static/tongyonh/bye.png') }]; @@ -122,6 +123,7 @@ eth.password=e; eth.coinList=[{ name:"ETH", + name2:"ETH", xname:'Ethereum', icon:require('@/static/tongyonh/Frame3299.png') }]; @@ -159,6 +161,7 @@ tron.password=e; tron.coinList=[{ name:"TRX", + name2:"TRX", xname:'TRON', icon:require('@/static/tongyonh/tron1.png') }]; diff --git a/pages/menu/collection/collectionDetail/index.vue b/pages/menu/collection/collectionDetail/index.vue index 5a470d4..53c0de4 100644 --- a/pages/menu/collection/collectionDetail/index.vue +++ b/pages/menu/collection/collectionDetail/index.vue @@ -1,7 +1,7 @@