代码

pages/menu/backUp/transPawKey/index.vue

@@ -97,6 +97,7 @@
 	 			}, 1500)
 	}
 	catch(err){
+		console.log(err,11)
 	   uni.showToast({
 	   	title: 'Creation failed',
 	   	icon: 'none',

pages/menu/token/btc/index.vue

@@ -19,7 +19,7 @@
 						<view class="" >
 							{{infoWallet.balance}}
 						</view>
-						<text class="text2">≈ $0.0</text>
+						<text class="text2">≈ $ {{balancePrice}}</text>
 					</text>
 					<image src="../../../../static/tongyonh/ethereum.png" mode="aspectFit" class="img1"
 						v-if="userObject.coinList[0].xname=='Ethereum'"></image>
@@ -149,6 +149,7 @@
 				type:'all',
 				trueType:'',
 				contract:'',
+				balancePrice:'',
 			}
 		},
 		methods: {
@@ -227,6 +228,7 @@
 			this.infoWallet = item
 			this.address=item.address
 			this.trueType=item.type	
+			this.balancePrice=item.balancePrice
            console.log(this.infoWallet,1111)
 			this.getWalletInfo()
 		},

pages/menu/token/btc/index2.vue

@@ -9,9 +9,10 @@
 				<view class="textcon1">
 					<text class="text1">
 						<view class="" >
-							{{infoWallet.balance}}
+							{{balance}}
 						</view>
-						<text class="text2">≈ $0.0</text>
+						<text class="text2" v-if="xbalance">≈ $ {{xbalance}}</text>
+						<text class="text2" v-if="!xbalance">≈ $ 0.00</text>
 					</text>
 				
 				</view>
@@ -208,16 +209,19 @@
 				})
 			}
 		},
-		onLoad(option) {
-			const item = JSON.parse(option.item);
-			this.infoWallet = item
-			this.address=item.address
-			this.trueType=item.type	
+		onLoad() {
+			this.infoWallet = uni.getStorageSync('wallet')
+			this.address=this.infoWallet.address
+			this.trueType=this.infoWallet.type	
 			var index=uni.getStorageSync('otherCoin')
-			this.contract=item.coinList[index].contractAddress
-			
-			this.xname=item.coinList[index].xname
-           console.log(this.infoWallet,1111)
+
+			console.log(this.infoWallet.coinList[index].contractAddress)
+			      console.log(this.infoWallet,1111)
+			this.contract=this.infoWallet.coinList[index].contractAddress
+	
+			this.xname=this.infoWallet.coinList[index].xname
+          this.balance=this.infoWallet.coinList[index].balance
+		  this.xbalance=this.infoWallet.coinList[index].balancePrice
 			this.getWalletInfo()
 		},
 		onReachBottom() {

pages/menu/wallet/index.vue

@@ -20,7 +20,7 @@
 				<image src="../../../static/tongyonh/eyeno.png" mode="aspectFit" class="img1" @click="showMoney22()" v-if="showMoney2"></image>
 				</view>
 				<view class="textcon2" v-if="showMoney1">
-					$ {{userObj.balance}}
+					$ {{!userObj.balancePrice?0.00:userObj.balancePrice}}
 				</view>
 				<view class="textcon2" v-if="showMoney2">
 					***
@@ -43,7 +43,7 @@
 						<image :src="item.icon" mode="aspectFit" class="img1"></image>
 						<view class="textcon">
 							<view class="text1">	
-							{{item.name2}}
+							{{item.name}}
 							</view>
 							<view class="text2">
 								{{item.xname}}
@@ -54,8 +54,11 @@
 						<view class="text1">
 							{{item.balance}}
 						</view>
-						<view class="text2">
-							=$0.00
+						<view class="text2" v-if="item.balancePrice">
+							≈ $ {{item.balancePrice}}
+						</view>
+						<view class="text2" v-if="!item.balancePrice">
+						≈ $ 0.00
 						</view>
 					</view>
 				</view>
@@ -92,13 +95,20 @@
 		onLoad() {
 			this.setStorage();
 			
-		var a=uni.getStorageSync('wallet')
-			if(a!=''){		
+			if(uni.getStorageSync('wallet')){		
 				this.userObj=uni.getStorageSync('wallet');
-			    console.log(this.userObj,1212121)
 				this.userObj2=uni.getStorageSync('wallet');
+				
+				let thar=this
+				setTimeout(
+				function(){
+					
+					thar.userObj=uni.getStorageSync('wallet');thar.userObj2=uni.getStorageSync('wallet');
+					thar.userObj.address = thar.userObj.ellipsisAddress},1000)
 				this.userObj.address = this.userObj.address.substring(0, 6)+'...'+this.userObj.address.substring(25,this.userObj.address.length);
 			}
+			
+			
 		},
 		methods: {
 		
@@ -135,7 +145,7 @@
 					// 代币页面
 				    uni.setStorageSync('otherCoin',index)
 					uni.navigateTo({
-						url:'/pages/menu/token/btc/index2?item='+item
+						url:'/pages/menu/token/btc/index2'
 					})	
 				}
 					

pages/menu/wallet/otherCoin/index.vue

@@ -112,8 +112,7 @@
 										that.tmoney=balance
 									 }); 
 								var b={
-										name:item.chainName,
-								        name2:item.contractName,
+										name:item.contractName,
 										xname:item.chainName,
 										icon:item.contractIconUrlAbs,
 										contractAddress:item.contractAddress,

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/a3d5cd30-43dd-11ec-b023-0d93e5e61c77
+https://ide.dcloud.net.cn/build/download/70f60090-449a-11ec-9351-13380ee8420f

unpackage/cache/apk/cmManifestCache.json

@@ -1 +1 @@
-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
+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

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)
 		switch (type) {
 			case 'BTC':
 				success([]);
@@ -32,7 +32,7 @@ let DataUtil = {
 							for (let i = 0; i < data.length; i++) {
 
 								if (!data[i].toAlias) {
-
+debugger;
 									if ((data[i].from != address && dataType == 'send') || (data[i]
 											.to != address && dataType == 'receive')) {
 										continue;
@@ -90,7 +90,7 @@ let DataUtil = {
 							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;

utils/TronUtil.js

@@ -93,7 +93,13 @@ let tron = {
 							name: res.data.data[i].tokenAbbr,
 							xname: res.data.data[i].tokenName,
 							balance: (Number(res.data.data[i].balance)/ Math.pow(10, res.data.data[i].tokenDecimal)),
-							icon: res.data.data[i].tokenLogo
+							icon: res.data.data[i].tokenLogo,
+							
+						}
+						if(res.data.data[i].tokenType==='trc20'){
+							coin.contractAddress=res.data.data[i].tokenId
+						}else{
+							coin.contractAddress=res.data.data[i].owner_address
 						}
 						list.push(coin)
 						

utils/WalletUtil.js

@@ -95,7 +95,7 @@ let WalletUtil = {
 	//助记词新建
 	mnemonicEstablishWallet: function(type, mnemonic, password) {
 		let walletInfo = uni.getStorageSync('walletInfo');
-        console.log(password,'password')
+        console.log(password,'password',type)
 		let walletdec;
 		switch (type) {
 			case 'BTC':
@@ -106,14 +106,15 @@ let WalletUtil = {
 				
 				break;
 			case 'ETH':
-				walletdec = TokenUtil.generateTron(mnemonic);
+				walletdec = TokenUtil.generateEth(mnemonic);
 				if(uni.getStorageSync('walletInfo')){
 					uni.setStorageSync('walleti',walletdec.address)
 				}
 				
 				break;
 			case 'TRX':
-				walletdec = TokenUtil.generateEth(mnemonic);
+				
+				walletdec = TokenUtil.generateTron(mnemonic);
 				if(uni.getStorageSync('walletInfo')){
 					uni.setStorageSync('walleti',walletdec.address)
 				}
@@ -153,7 +154,7 @@ let WalletUtil = {
 		wallet.password = password;
 		wallet.privateKey = walletdec.privateKey;
 		wallet.address = walletdec.address;
-		walletInfo.push(wallet);
+		walletInfo[type].push(wallet);
 		uni.setStorageSync('walletInfo', walletInfo);
 		uni.setStorageSync('wallet', wallet);
 		this.updateBalance();
@@ -189,6 +190,8 @@ let WalletUtil = {
 		console.log()
 		for (var k = 0, length = walletList.length; k < length; k++) {
 			if (walletList[k].address === address) {
+				walletList[k].ellipsisAddress = address.substring(0, 6) + '...' + address.substring(25,
+					address.length)
 				uni.setStorageSync('wallet', walletList[k]);
 				break;
 			}
@@ -198,7 +201,23 @@ let WalletUtil = {
 	},
 	updateBalance:function() {
 		
-		let wallet = uni.getStorageSync('wallet');
+		const wallet = uni.getStorageSync('wallet');
+		const walletInfo = uni.getStorageSync('walletInfo');
+		
+		for (var k = 0, length = walletInfo[wallet.type].length; k < length; k++) {
+			console.log(wallet,1212313)
+			if (walletInfo[wallet.type][k].address === wallet.address) {	
+				walletInfo[wallet.type][k]=wallet;
+				console.log(1321312,walletInfo[wallet.type][k])
+				console.log(555555,walletInfo)
+				break;
+				
+			
+			}
+			
+		}
+		uni.setStorageSync('walletInfo',  null);
+		uni.setStorageSync('walletInfo',  walletInfo);
 		let that=this
 		this.getPrice(wallet.type,function(rr){
 			that.getPrice('USDT',function(usdt){