以太坊余额修复

App.vue

@@ -18,9 +18,6 @@
 		},
 		onShow: function() {
 			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
 		}
 	}
 </script>

pages/menu/wallet/index.vue

@@ -111,7 +111,7 @@
 			this.isStop = true
 			uni.setStorageSync('isWallet', false);
 		},
-		async onLoad() {
+		onLoad() {
 			
 			let currency = uni.getStorageSync('currency');
 			if (currency) {
@@ -120,12 +120,11 @@
 			
 			// 拿钱包
 			//console.log(this.$TronUtil.decode("TBk72yKTJWppCsa7XrsU7Qhfo4yNvbm8rE"))
-			
 			this.userObj = uni.getStorageSync('wallet');
-			this.userObj = await this.$walletUtil.updateBalance();
+			this.updateBalance();
 			uni.setStorageSync('isWallet', false);
 			// #ifdef APP-PLUS
-			this.appVersion()
+			//this.appVersion()
 			// #endif
 
 
@@ -135,14 +134,18 @@
 				return this.$t('index')
 			},
 		},
-		async onPullDownRefresh() {
-			this.userObj = await this.$walletUtil.updateBalance();
+		onPullDownRefresh() {
+			this.updateBalance();
 			
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 500);
 		},
 		methods: {
+			async updateBalance(){
+				
+				this.userObj = await this.$walletUtil.updateBalance();
+			},
 			async appVersion() {
 				let param = {
 					'appId': uni.getSystemInfoSync().platform

unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,7 +1,7 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/register/index","pages/menu/index/index","pages/menu/token/btc/index","pages/menu/wallet/search/index","pages/menu/collection/collectionDetailtrue/index","pages/menu/collection/addCollection/index","pages/menu/collection/collectionDetail/index","pages/menu/collection/index","pages/menu/wallet/otherCoin/index","pages/menu/backUp/index","pages/menu/wallet/cwallet/index","pages/menu/backUp/transPawMan/index","pages/menu/backUp/transPawKey/index","pages/menu/backUp/transPawKeyOut/index","pages/menu/backUp/backUpWord/index","pages/menu/backUp/backUp5/index","pages/menu/backUp/backUp4/index","pages/menu/market/index","pages/menu/backUp/transPaw/index","pages/menu/address/backUp/index","pages/menu/backUp/backUp2/index","pages/menu/wallet/add/index","pages/menu/backUp/backUp3/index","pages/menu/backUp/reSuccessful","pages/menu/wallet/mwallet/manage/index","pages/menu/sendToken/addAddress2/index","pages/menu/sendToken/addAddress/index","pages/menu/profile/index","pages/menu/address/index","pages/menu/sendToken/address/index","pages/menu/sendToken/transfer/index","pages/menu/sendToken/enPassword/index","pages/menu/setting/index","pages/menu/wallet/mwallet/index","pages/menu/transction/detail2/index","pages/menu/transction/detail/index","pages/menu/sendToken/index2","pages/menu/sendToken/index","pages/menu/address/addressMangement/index","pages/menu/wallet/index","pages/menu/load/index","pages/menu/discover/index","pages/menu/address/showKey/index","pages/menu/setting/payPassword/index","pages/menu/setting/addBtcNode/index","pages/menu/setting/btcNodeSetting/index","pages/menu/setting/nodeSetting/index","pages/menu/setting/currency/index","pages/menu/setting/lang/index","pages/menu/about/index","pages/menu/about/Privacy/index","pages/menu/about/terms/index","pages/menu/address/improtKey/index"],"window":{"navigationBarTextStyle":"black","navigationBarBackgroundColor":"#fff","style":{"app-plus":{"titleNView":false}}},"networkTimeout":{"request":10000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"BITCOOO","compilerVersion":"3.2.15","entryPagePath":"pages/register/index"};
+var __uniConfig = {"pages":["pages/register/index","pages/menu/index/index","pages/menu/token/btc/index","pages/menu/wallet/search/index","pages/menu/collection/collectionDetailtrue/index","pages/menu/collection/addCollection/index","pages/menu/collection/collectionDetail/index","pages/menu/collection/index","pages/menu/wallet/otherCoin/index","pages/menu/backUp/index","pages/menu/wallet/cwallet/index","pages/menu/backUp/transPawMan/index","pages/menu/backUp/transPawKey/index","pages/menu/backUp/transPawKeyOut/index","pages/menu/backUp/backUpWord/index","pages/menu/backUp/backUp5/index","pages/menu/backUp/backUp4/index","pages/menu/market/index","pages/menu/backUp/transPaw/index","pages/menu/address/backUp/index","pages/menu/backUp/backUp2/index","pages/menu/wallet/add/index","pages/menu/backUp/backUp3/index","pages/menu/backUp/reSuccessful","pages/menu/wallet/mwallet/manage/index","pages/menu/sendToken/addAddress2/index","pages/menu/sendToken/addAddress/index","pages/menu/profile/index","pages/menu/address/index","pages/menu/sendToken/address/index","pages/menu/sendToken/transfer/index","pages/menu/sendToken/enPassword/index","pages/menu/setting/index","pages/menu/wallet/mwallet/index","pages/menu/transction/detail2/index","pages/menu/transction/detail/index","pages/menu/sendToken/index2","pages/menu/sendToken/index","pages/menu/address/addressMangement/index","pages/menu/wallet/index","pages/menu/load/index","pages/menu/discover/index","pages/menu/address/showKey/index","pages/menu/setting/payPassword/index","pages/menu/setting/addBtcNode/index","pages/menu/setting/btcNodeSetting/index","pages/menu/setting/nodeSetting/index","pages/menu/setting/currency/index","pages/menu/setting/lang/index","pages/menu/about/index","pages/menu/about/Privacy/index","pages/menu/about/terms/index","pages/menu/address/improtKey/index"],"window":{"navigationBarTextStyle":"black","navigationBarBackgroundColor":"#fff","style":{"app-plus":{"titleNView":false}}},"networkTimeout":{"request":10000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"BITCOOO","compilerVersion":"3.2.12","entryPagePath":"pages/register/index"};
 var __uniRoutes = [{"path":"/pages/register/index","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/index/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/token/btc/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/wallet/search/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/collection/collectionDetailtrue/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/collection/addCollection/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/collection/collectionDetail/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/collection/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/wallet/otherCoin/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/backUp/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/wallet/cwallet/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/backUp/transPawMan/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/backUp/transPawKey/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/backUp/transPawKeyOut/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/backUp/backUpWord/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/backUp/backUp5/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/backUp/backUp4/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/market/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/backUp/transPaw/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/address/backUp/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/backUp/backUp2/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/wallet/add/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/backUp/backUp3/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/backUp/reSuccessful","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/wallet/mwallet/manage/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/sendToken/addAddress2/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/sendToken/addAddress/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/profile/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/address/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/sendToken/address/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/sendToken/transfer/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/sendToken/enPassword/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/setting/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/wallet/mwallet/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/transction/detail2/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/transction/detail/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/sendToken/index2","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/sendToken/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/address/addressMangement/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/wallet/index","meta":{},"window":{"navigationStyle":"custom","enablePullDownRefresh":true,"onReachBottomDistance":10}},{"path":"/pages/menu/load/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/discover/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/address/showKey/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/setting/payPassword/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/setting/addBtcNode/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/setting/btcNodeSetting/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/setting/nodeSetting/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/setting/currency/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/setting/lang/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/about/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/about/Privacy/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/about/terms/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/address/improtKey/index","meta":{},"window":{"navigationStyle":"custom"}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});

unpackage/dist/dev/app-plus/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__1ECBEE1","name":"BITCOOO","version":{"name":"1.1","code":110},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"FaceID":{},"Fingerprint":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"compatible":{"ignoreVersion":true},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"androidStyle":"default","iosStyle":"default","android":{"hdpi":"","xhdpi":"","xxhdpi":""}},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.2.15","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"launch_path":"__uniappview.html"}}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__1ECBEE1","name":"BITCOOO","version":{"name":"1.1","code":110},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"FaceID":{},"Fingerprint":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"compatible":{"ignoreVersion":true},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"androidStyle":"default","iosStyle":"default","android":{"hdpi":"","xhdpi":"","xxhdpi":""}},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.2.12","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"launch_path":"__uniappview.html"}}

utils/EthUtil.js

@@ -12,13 +12,13 @@ if (typeof web3 !== 'undefined') {
 
 
 let eth = {
-	// //获取主币eth余额
-	// getBalance: async function(address) {
-	// 	 web3 = new Web3(new Web3.providers.HttpProvider(systemConfiguration.constant.ethNode));
-	// 	let balance = await web3.eth.getBalance(address);
-	// 	console.log("余额：",balance)
-	// 	return Number(balance) / Math.pow(10, 18);
-	// },
+	//获取主币eth余额
+	getBalance: async function(address) {
+		console.log("查询余额：",address)
+		let balance = await web3.eth.getBalance(address);
+		console.log("余额：",balance)
+		return Number(balance) / Math.pow(10, 18);
+	},
 	// //获取eth代币币余额
 	// getTokenBalance: async function(address, contract) {
 	// 	console.log(address, contract)
@@ -38,28 +38,28 @@ let eth = {
 		return gasPrice;
 	},
 
-	//获取主币eth余额
-	getBalance: async function(address) {
-		web3 = new Web3();
-		const data = {
-			'jsonrpc': '2.0',
-			'id': '1',
-			'method': 'eth_getBalance',
-			'params': [address, "latest"]
-		};
-		let res = await uni.request({
-			url: systemConfiguration.constant.ethNode, //仅为示例，并非真实接口地址。
-			method: 'POST',
-			data: data,
-			dataType: 'json'
-		});
-		try {
-			let balance = Number(web3.utils.hexToNumberString(res[1].data.result)) / Math.pow(10, 18)
-			return balance
-		} catch (e) {
-			return 0;
-		}
-	},
+	// //获取主币eth余额
+	// getBalance: async function(address) {
+	// 	web3 = new Web3();
+	// 	const data = {
+	// 		'jsonrpc': '2.0',
+	// 		'id': '1',
+	// 		'method': 'eth_getBalance',
+	// 		'params': [address, "latest"]
+	// 	};
+	// 	let res = await uni.request({
+	// 		url: systemConfiguration.constant.ethNode, //仅为示例，并非真实接口地址。
+	// 		method: 'POST',
+	// 		data: data,
+	// 		dataType: 'json'
+	// 	});
+	// 	try {
+	// 		let balance = Number(web3.utils.hexToNumberString(res[1].data.result)) / Math.pow(10, 18)
+	// 		return balance
+	// 	} catch (e) {
+	// 		return 0;
+	// 	}
+	// },
 	addPreZero: function(num) {
 		let t = (num + '').length,
 			s = '';

utils/SystemConfiguration.js

@@ -9,7 +9,7 @@ const constant = isTest ? {
 	//服务端连接
 	serverUrl: 'http://wallet-api.weirui0755.com',
 	coinTickerWs:'ws://wallet-quartz.weirui0755.com/websocket',
-	ethNode:'',
+	ethNode:'http://47.245.25.82:8545',
 }
 
 export default {

utils/WalletUtil.js

@@ -234,7 +234,7 @@ let WalletUtil = {
 				break;
 			case 'ETH':
 				console.log("进来ETH",wallet.balance )
-				wallet.balance = await EthUtil.getBalance(wallet.address);
+				wallet.balance = await EthUtil.getBalance(wallet.addresss);
 				console.log("进来ETH",wallet.balance )
 				for (let i = 1; i < wallet.coinList.length; i++) {
 					wallet.coinList[i].balance = await EthUtil.getTokenBalance(wallet.address, wallet.coinList[i].contractAddress);

utils/locales/zh-F.js

@@ -28,11 +28,7 @@ export default {
 		apps: '應用設置',
 		magew: '管理錢包',
 		addBook: '地址本',
-<<<<<<< HEAD
 		Settings: '設置',
-=======
-		Settings: '設定',
->>>>>>> 60b1293a0d93612ba30d4165773ea5873286f77c
 		helpcen: '幫助中心',
 		aboutus: '關於我們',
 		Hardware: '硬件',
@@ -129,17 +125,10 @@ export default {
 		// nftCollection
 		NFTcollection: 'NFT收藏品',
 		Contractaddress: '合約地址',
-<<<<<<< HEAD
 		TokenID: '令牌ID',
 		entercontractaddress: '請輸入合約地址',
 		entertokenID: '請輸入令牌ID',
 		Contracts: '合約',
-=======
-		TokenID: '令牌標識',
-		entercontractaddress: '請輸入契约地址',
-		entertokenID: '請輸入令牌標識',
-		Contracts: '契约',
->>>>>>> 60b1293a0d93612ba30d4165773ea5873286f77c
 		ID: 'ID',
 		Collectiondetails: '收藏品詳情',
 		// btc index
@@ -151,11 +140,7 @@ export default {
 		// sendToken index
 		Receivingaddress: '接收地址',
 		ReceivingaddressError: '接收地址錯誤',
-<<<<<<< HEAD
 		ScanQR: '掃描二維碼以轉移到資產',
-=======
-		ScanQR: '掃描二維碼轉賬至資產',
->>>>>>> 60b1293a0d93612ba30d4165773ea5873286f77c
 		Copyaddress: '複製地址',
 		CopySuccessful: '複製地址成功！',
 		// transfer
@@ -165,11 +150,7 @@ export default {
 		Balance: '餘額',
 		ALL: "所有",
 		Remark: '備註',
-<<<<<<< HEAD
 		Transactionfee: '礦工費',
-=======
-		Transactionfee: '交易費',
->>>>>>> 60b1293a0d93612ba30d4165773ea5873286f77c
 		Transferconfirmation: '轉帳確認',
 		Amount: '金額',
 		Sendaddress: '發送地址',
@@ -193,11 +174,7 @@ export default {
 		// backup5
 		Importviaprivatekey: '通過私鑰導入',
 		Privatekeyimportverification: '私鑰導入驗證',
-<<<<<<< HEAD
 		privatekeyanddo: '請輸入您的私鑰，不要將其洩露給其他人外部地址無法通過助記鍵恢復。 請妥善保管',
-=======
-		privatekeyanddo: '請輸入您的私鑰，不要洩露給他人，外部地址無法通過助記詞恢復。請妥善保管',
->>>>>>> 60b1293a0d93612ba30d4165773ea5873286f77c
 		enteryourprivatekey: '請輸入您的私鑰',
 		beempty: '不能為空',
 		beenimported: '錢包已經被導入',
@@ -224,11 +201,7 @@ export default {
 		Transactiondetails: '交易詳情',
 		Confirmed: '成功',
 		Time: '時間',
-<<<<<<< HEAD
 		TxFee: '礦工費',
-=======
-		TxFee: '交易费用',
->>>>>>> 60b1293a0d93612ba30d4165773ea5873286f77c
 		TransactionID: '交易ID',
 		others: '其他',
 		me: '我',

utils/locales/zh.js

@@ -138,11 +138,7 @@ export default {
 		// sendToken index
 		Receivingaddress: '接收地址',
 		ReceivingaddressError: '接收地址错误',
-<<<<<<< HEAD
 		ScanQR: '扫描二维码以转移到资产',
-=======
-		ScanQR: '扫描二维码转账至资产',
->>>>>>> 60b1293a0d93612ba30d4165773ea5873286f77c
 		Copyaddress: '复制地址',
 		CopySuccessful: '复制地址成功！',
 		// transfer
@@ -152,11 +148,7 @@ export default {
 		Balance: '余额',
 		ALL: "所有",
 		Remark: '备注',
-<<<<<<< HEAD
 		Transactionfee: '矿工费',
-=======
-		Transactionfee: '交易费',
->>>>>>> 60b1293a0d93612ba30d4165773ea5873286f77c
 		Transferconfirmation: '转账确认',
 		Amount: '金额',
 		Sendaddress: '发送地址',
@@ -207,11 +199,7 @@ export default {
 		Transactiondetails: '交易详情',
 		Confirmed: '成功',
 		Time: '时间',
-<<<<<<< HEAD
 		TxFee: '矿工费',
-=======
-		TxFee: '交易费用',
->>>>>>> 60b1293a0d93612ba30d4165773ea5873286f77c
 		TransactionID: '交易ID',
 		others: '其他',
 		me: '我',