代码

pages/menu/token/btc/index.vue

@@ -200,9 +200,14 @@
 				this.param.address = this.address
 				this.userObject = this.infoWallet
 				var that = this
-				this.$dataUtil.transactionData('ETH', 'send', this.address2, '0xdac17f958d2ee523a2206206994597c13d831ec7',
+				this.$dataUtil.transactionData('ETH', this.type, this.address2, '0xdac17f958d2ee523a2206206994597c13d831ec7',
 					1, 20,
 					function(data) {
+						if(data.length==0){
+							that.showInfo=true;
+						}else{
+							that.showInfo=false;
+						}
 						that.trxs = data
 						that.trxs2 = data
 						console.log(that.trxs, 12121)

pages/menu/wallet/index.vue

@@ -91,15 +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')

unpackage/dist/dev/app-plus/app-view.js

@@ -23220,9 +23220,19 @@ __webpack_require__.r(__webpack_exports__);
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/view/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/using-components.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/view/style.js!C:/Users/Administrator/Desktop/bitcoo/pages/menu/wallet/index.vue?vue&type=script&lang=js&mpType=page ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
-/***/ (function(module, exports) {
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default =
+
+{
 
-throw new Error("Module build failed (from ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/view/script.js):\nSyntaxError: Unexpected token (94:0)\n    at Object._raise (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:746:17)\n    at Object.raiseWithData (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:739:17)\n    at Object.raise (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:733:17)\n    at Object.unexpected (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:8807:16)\n    at Object.parseExprAtom (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:10130:20)\n    at Object.parseExprSubscripts (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:9656:23)\n    at Object.parseMaybeUnary (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:9636:21)\n    at Object.parseMaybeUnary (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:6877:20)\n    at Object.parseExprOps (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:9506:23)\n    at Object.parseMaybeConditional (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:9479:23)\n    at Object.parseMaybeAssign (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:9434:21)\n    at Object.parseMaybeAssign (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:6822:20)\n    at Object.parseExpression (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:9386:23)\n    at Object.parseStatementContent (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:11285:23)\n    at Object.parseStatementContent (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:6575:18)\n    at Object.parseStatement (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:11156:17)");
+  data: function data() {
+    return {
+      wxsProps: {} };
+
+  },
+  components: {} };exports.default = _default;
 
 /***/ }),
 /* 539 */

utils/BtcUtil.js

@@ -12,7 +12,8 @@ let BtcUtil = {
 						if (res.data.code === 1) {
 							if(res.data.data.length>0){
 								var data=res.data.data[0];
-								for(obj b in data){
+								console.log(data,11111)
+								for(let b in data){
 									balance=data[b];
 								}
 							}

utils/TronUtil.js

@@ -29,13 +29,14 @@ let tron = {
 	//查询TRC/USDT余额
 	getTronTokenBalance: async function(address, contract) {
 		const contract_address = await tronWeb.address.fromHex(contract);
-		console.log('查询trc20余额');
+		console.log('查询trc20余额',contract);
 		contract = await tronWeb.contract().at(contract_address);
+		
 		let symbol = await contract.name().call();
 		let decimals = await contract.decimals.call();
 		let totalSupply = contract.totalSupply().call();
 		let balance = await contract.balanceOf(address).call();
-		console.log('代币trc余额' + tronWeb.fromSun(balance))
+		
 		return balance / Math.pow(10, 6);
 	},
 	// 发起TRC/USDT交易

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'
 
@@ -209,12 +208,12 @@ console.log(password,'password')
 					wallet.balance=res;
 					wallet.coinList[0].balance=res
 					for(let i=1;i<wallet.coinList.length;i++){
-						TronUtil.getTronTokenBalance(wallet.address,wallet.coinList[i].contractAddress).then((res) => {
-							wallet.coinList[i].balance=res;
-						})
+						
 					}
-				}).catch(err => {
-					console.log(err)
+				})
+				TronUtil.getTronTokenBalance(wallet.address,'TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t').then((r) => {
+					console.log(r,111111111)
+					//wallet.coinList[i].balance=r;
 				})
 				break;
 				uni.setStorageSync('wallet', wallet);