Merge branch 'master' of http://git.weirui0755.com/jack/bitcooo

pages/menu/wallet/cwallet/index.css

@@ -117,7 +117,7 @@
 	margin-right: 20rpx;
 }
 .bot_con .item .left .textcon .text1{
-	font-size: 36rpx;
+	font-size: 30rpx;
 	color: #fff;
 }
 .bot_con .item .left .textcon{
@@ -125,8 +125,8 @@
 	flex: 1;
 }
 .bot_con .item .left .textcon .text2{
-	font-size: 28rpx;
+	font-size: 24rpx;
-	color: rgba(255,255,255,.5);
+	color: #FFFFFF;
 	word-break: break-all;
 
 }

utils/WalletUtil.js

@@ -176,7 +176,8 @@ let WalletUtil = {
 			for (let obj in walletInfo) {
 				for (var k = 0, length = walletInfo[obj].length; k < length; k++) {
 					let address = walletInfo[obj][k].address;
-					walletInfo[obj][k].ellipsisAddress = address.substring(0, 6) + '...' + address.substring(25,
+					
+					walletInfo[obj][k].ellipsisAddress = address.substring(0, 6) + '...' + address.substring(address.length-6,
 						address.length);
 					walletInfo[obj][k].type = obj;
 					walletList.push(walletInfo[obj][k]);