diff --git a/utils/DataUtil.js b/utils/DataUtil.js
index 8d2fc2e..c5cfb2f 100644
--- a/utils/DataUtil.js
+++ b/utils/DataUtil.js
@@ -1,7 +1,7 @@
 import index from './index.js'
 let DataUtil = {
 	transactionData: function(type, dataType, address, contract, pageNum, pageSize, success) {
- console.log(type, dataType, address, contract, pageNum, pageSize,1111)
+		console.log(type, dataType, address, contract, pageNum, pageSize, 1111)
 		switch (type) {
 			case 'BTC':
 				success([]);
@@ -32,7 +32,7 @@ let DataUtil = {
 							for (let i = 0; i < data.length; i++) {
 
 								if (!data[i].toAlias) {
-debugger;
+									debugger;
 									if ((data[i].from != address && dataType == 'send') || (data[i]
 											.to != address && dataType == 'receive')) {
 										continue;
@@ -49,31 +49,33 @@ debugger;
 
 									}
 									if (data[i].from === address) {
-										let address =  data[i].to;
-										address = address.substring(0, 6) + '...' + address.substring(25,
+										let address = data[i].to;
+										address = address.substring(0, 6) + '...' + address.substring(
+											25,
 											address.length)
 										transactionData.address = address;
 										transactionData.type = 'out';
 									} else {
-										let address =  data[i].from;
-										address = address.substring(0, 6) + '...' + address.substring(25,
+										let address = data[i].from;
+										address = address.substring(0, 6) + '...' + address.substring(
+											25,
 											address.length)
 										transactionData.address = address;
-										
+
 										transactionData.type = 'in';
 									}
 									dataList.push(transactionData)
 								}
 							}
 
-							
+
 						}
 						success(dataList)
 
 					},
-                     error: (res) => {
-						 success(dataList)
-					 }					
+					error: (res) => {
+						success(dataList)
+					}
 				});
 			} else {
 				uni.request({
@@ -90,7 +92,7 @@ debugger;
 							for (let i = 0; i < data.length; i++) {
 
 								if (!data[i].toAlias) {
-									
+
 									if ((data[i].from != address && dataType == 'send') || (data[i]
 											.to != address && dataType == 'receive')) {
 										continue;
@@ -107,24 +109,26 @@ debugger;
 
 									}
 									if (data[i].from === address) {
-										let address =  data[i].to;
-										address = address.substring(0, 6) + '...' + address.substring(36,
+										let address = data[i].to;
+										address = address.substring(0, 6) + '...' + address.substring(
+											36,
 											address.length)
 										transactionData.address = address;
 										transactionData.type = 'out';
 									} else {
-										let address =  data[i].from;
-										address = address.substring(0, 6) + '...' + address.substring(36,
+										let address = data[i].from;
+										address = address.substring(0, 6) + '...' + address.substring(
+											36,
 											address.length)
 										transactionData.address = address;
-										
+
 										transactionData.type = 'in';
 									}
 									dataList.push(transactionData)
 								}
 							}
 
-							
+
 						}
 						success(dataList)
 
@@ -137,8 +141,10 @@ debugger;
 
 		,
 	trxTransactionData: function(contract, dataType, address, pageNum, pageSize, success) {
+
 		let dataList = [];
-		if (!contract) {
+		let add = address
+		if (contract == null || contract == '') {
 			uni.request({
 				url: 'http://scan.weirui0755.com/trx/api/trx/address/normal/' + address + '/' +
 					pageNum +
@@ -147,14 +153,15 @@ debugger;
 					'content-type': 'application/x-www-form-urlencoded', //自定义请求头信息
 				},
 				success: (res) => {
-					console.log(res, 1234654)
+					console.log(res.data.code)
 					if (res.data.code === 1) {
 						var data = res.data.data;
-						for (let i = 0; i < data.length; i++) {
 
+						for (let i = 0; i < data.length; i++) {
 
-							if ((data[i].from != address && dataType == 'send') || (data[i]
-									.to != address && dataType == 'receive')) {
+							if ((data[i].from != add && dataType == 'send') || (data[i]
+									.to != add && dataType == 'receive') || data[i].tType !=
+								'Transfer') {
 								continue;
 							}
 							var transactionData = {
@@ -169,24 +176,24 @@ debugger;
 
 							}
 							if (data[i].from === address) {
-								var address=data[i].to
+								var address = data[i].to
 								address = address.substring(0, 6) + '...' + address.substring(36,
 									address.length);
 								transactionData.address = address;
 								transactionData.type = 'out';
 							} else {
-								var address=data[i].from
+								var address = data[i].from
 								address = address.substring(0, 6) + '...' + address.substring(36,
 									address.length);
 								transactionData.address = address;
-								
+
 								transactionData.type = 'in';
 							}
-							console.log(transactionData.address,123456)
+							console.log(transactionData.address, 123456)
 							dataList.push(transactionData)
 						}
 
-						
+
 					}
 					success(dataList)
 
@@ -201,15 +208,18 @@ debugger;
 					'content-type': 'application/x-www-form-urlencoded', //自定义请求头信息
 				},
 				success: (res) => {
-					console.log(res, 1234654)
+					console.log(res, 12346545555)
+					console.log(dataType, 5555555555)
 					if (res.data.code === 1) {
 						var data = res.data.data;
-						for (let i = 0; i < data.length; i++) {
 
+						for (let i = 0; i < data.length; i++) {
+							console.log(!data[i].toAlias, 5555555555,data[i].to == add)
 							if (!data[i].toAlias) {
 
-								if ((data[i].from != address && dataType == 'send') || (data[i]
-										.to != address && dataType == 'receive')) {
+
+								if ((data[i].to == add && dataType == 'send') || (data[i]
+										.from == add && dataType == 'receive')) {
 									continue;
 								}
 								var transactionData = {
@@ -224,24 +234,26 @@ debugger;
 
 								}
 								if (data[i].from === address) {
-									var address=data[i].to
-									address = address.substring(0, 6) + '...' + address.substring(25,
+									var address = data[i].to
+									address = address.substring(0, 6) + '...' + address.substring(
+										25,
 										address.length);
 									transactionData.address = address;
 									transactionData.type = 'out';
 								} else {
-									var address=data[i].from
-									address = address.substring(0, 6) + '...' + address.substring(25,
+									var address = data[i].from
+									address = address.substring(0, 6) + '...' + address.substring(
+										25,
 										address.length);
 									transactionData.address = address;
-									
+
 									transactionData.type = 'in';
 								}
 								dataList.push(transactionData)
 							}
 						}
 
-						
+
 					}
 					success(dataList)