钱包工具类

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!=''){		

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'