From c84b63b9c86c5534a2c5b041725b07e58f1ae48a Mon Sep 17 00:00:00 2001
From: vee <897831508@qq.com>
Date: Sat, 13 Nov 2021 20:44:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=92=B1=E5=8C=85=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/menu/wallet/index.vue | 11 +----------
 utils/WalletUtil.js         |  1 -
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/pages/menu/wallet/index.vue b/pages/menu/wallet/index.vue
index 3e7b4e9..294cd25 100644
--- a/pages/menu/wallet/index.vue
+++ b/pages/menu/wallet/index.vue
@@ -91,16 +91,7 @@
 	
 		onLoad() {
 			this.setStorage();
-<<<<<<< HEAD
-		
-			// this.$dataUtil.transactionData('TRX','send','TBREsCfBdPyD612xZnwvGPux7osbXvtzLh',
-			// 'TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t',1,30,function(data){
-			// 	console.log(data)
-			// })
-=======
-			
->>>>>>> d7d4287f83979c52652783d73d0461739966272d
-			// this.getWalletBalance();
+
 			
 		var a=uni.getStorageSync('wallet')
 			if(a!=''){		
diff --git a/utils/WalletUtil.js b/utils/WalletUtil.js
index fde9a7f..9a818d2 100644
--- a/utils/WalletUtil.js
+++ b/utils/WalletUtil.js
@@ -1,6 +1,5 @@
 import TokenUtil from './TokenUtil.js'
 import BtcUtil from './BtcUtil.js'
-import BtcUtil from './BtcUtil.js'
 import TronUtil from './TronUtil.js'
 import EthUtil from './EthUtil.js'
 

From 898e2ec32f25a1c22614b5d6510f6a8fb6fcfd65 Mon Sep 17 00:00:00 2001
From: vee <897831508@qq.com>
Date: Sat, 13 Nov 2021 21:55:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=92=B1=E5=8C=85=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/WalletUtil.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/WalletUtil.js b/utils/WalletUtil.js
index 593356f..5b86f41 100644
--- a/utils/WalletUtil.js
+++ b/utils/WalletUtil.js
@@ -209,7 +209,7 @@ console.log(password,'password')
 				TronUtil.getTronBalance(wallet.address).then((res) => {
 					wallet.balance=res;
 					wallet.coinList[0].balance=res
-					TronUtil.getContract('TWgEuYRuXgwfDbcfzZsteu5w5dq1nFR35w',wallet.coinList,function(list){
+					TronUtil.getContract(wallet.address,wallet.coinList,function(list){
 						wallet.coinList=list;
 						console.log(wallet.coinList)
 						uni.setStorageSync('wallet', wallet);