From 4b0c4d2e9c81eb78d19e0c2f0acd0309e96f7a92 Mon Sep 17 00:00:00 2001
From: vee <897831508@qq.com>
Date: Sun, 14 Nov 2021 01:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E5=8C=85=E5=B7=A5=E5=85=B7=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/DataUtil.js           |  4 +---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pages/menu/wallet/index.vue b/pages/menu/wallet/index.vue
index c7c97f4..7ae6ff4 100644
--- a/pages/menu/wallet/index.vue
+++ b/pages/menu/wallet/index.vue
@@ -99,7 +99,7 @@
 				this.userObj=uni.getStorageSync('wallet');
 				this.userObj2=uni.getStorageSync('wallet');
 				
-				let thar=this
+				
 				this.updateData();
 				this.userObj.address = this.userObj.address.substring(0, 6)+'...'+this.userObj.address.substring(25,this.userObj.address.length);
 			}
@@ -112,9 +112,12 @@
 			setTimeout(
 			function(){
 				
-				thar.userObj=uni.getStorageSync('wallet');thar.userObj2=uni.getStorageSync('wallet');
-				thar.userObj.address = thar.userObj.ellipsisAddress},1000);
-				thar.updateData()
+				thar.userObj=uni.getStorageSync('wallet');
+				thar.userObj2=uni.getStorageSync('wallet');
+				thar.userObj.address = thar.userObj.ellipsisAddress;
+				thar.updateData();
+				},200);
+				
 		},
 	    goOther(){
 			console.log(this.userObj2,8888)
diff --git a/utils/DataUtil.js b/utils/DataUtil.js
index c5cfb2f..b23c9c0 100644
--- a/utils/DataUtil.js
+++ b/utils/DataUtil.js
@@ -215,8 +215,7 @@ let DataUtil = {
 
 						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].to == add && dataType == 'send') || (data[i]
 										.from == add && dataType == 'receive')) {
@@ -251,7 +250,6 @@ let DataUtil = {
 								}
 								dataList.push(transactionData)
 							}
-						}
 
 
 					}