1123

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,8 +111,13 @@
 			this.isStop = true
 			uni.setStorageSync('isWallet', false);
 		},
+<<<<<<< HEAD
 		async onLoad() {
 			console.log('eth有走这吗')
+=======
+		onLoad() {
+			
+>>>>>>> b5a6c0c02905415727eb685f944bf652207b8af9
 			let currency = uni.getStorageSync('currency');
 			if (currency) {
 				this.currency = currency;
@@ -120,13 +125,16 @@
 			
 			// 拿钱包
 			//console.log(this.$TronUtil.decode("TBk72yKTJWppCsa7XrsU7Qhfo4yNvbm8rE"))
-			
 			this.userObj = uni.getStorageSync('wallet');
+<<<<<<< HEAD
 			this.userObj = await this.$walletUtil.updateBalance(); 
 			console.log('eth有走这吗')
+=======
+			this.updateBalance();
+>>>>>>> b5a6c0c02905415727eb685f944bf652207b8af9
 			uni.setStorageSync('isWallet', false);
 			// #ifdef APP-PLUS
-			this.appVersion()
+			//this.appVersion()
 			// #endif
 
 
@@ -136,14 +144,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-view.js

@@ -22261,19 +22261,9 @@ __webpack_require__.r(__webpack_exports__);
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/view/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/using-components.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/view/style.js!C:/Users/Administrator/Desktop/bitcoo/pages/menu/wallet/index.vue?vue&type=script&lang=js&mpType=page ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default =
-
-{
-
-  data: function data() {
-    return {
-      wxsProps: {} };
+/***/ (function(module, exports) {
 
-  },
-  components: {} };exports.default = _default;
+throw new Error("Module build failed (from ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/view/script.js):\nSyntaxError: Unexpected token (114:0)\n    at Object._raise (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:746:17)\n    at Object.raiseWithData (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:739:17)\n    at Object.raise (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:733:17)\n    at Object.unexpected (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:8807:16)\n    at Object.parseIdentifierName (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:10823:18)\n    at Object.parseIdentifier (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:10800:23)\n    at Object.parseMaybePrivateName (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:10157:19)\n    at Object.parsePropertyName (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:10624:126)\n    at Object.parseObjectMember (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:10525:10)\n    at Object.parseObj (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:10448:25)\n    at Object.parseExprAtom (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:10055:28)\n    at Object.parseExprSubscripts (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:9656:23)\n    at Object.parseMaybeUnary (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:9636:21)\n    at Object.parseMaybeUnary (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:6877:20)\n    at Object.parseExprOps (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:9506:23)\n    at Object.parseMaybeConditional (C:\\Users\\Administrator\\Desktop\\HBuilderX\\plugins\\uniapp-cli\\node_modules\\@babel\\parser\\lib\\index.js:9479:23)");
 
 /***/ }),
 /* 544 */

utils/EthUtil.js

@@ -12,9 +12,15 @@ if (typeof web3 !== 'undefined') {
 
 
 let eth = {
+<<<<<<< HEAD
 	// //获取主币eth余额
 	getBalance: async function(address) {
 		 web3 = new Web3(new Web3.providers.HttpProvider(systemConfiguration.constant.ethNode));
+=======
+	//获取主币eth余额
+	getBalance: async function(address) {
+		console.log("查询余额：",address)
+>>>>>>> b5a6c0c02905415727eb685f944bf652207b8af9
 		let balance = await web3.eth.getBalance(address);
 		console.log("余额：",balance)
 		return Number(balance) / Math.pow(10, 18);

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/locales/zh-F.js

@@ -140,7 +140,11 @@ export default {
 		// sendToken index
 		Receivingaddress: '接收地址',
 		ReceivingaddressError: '接收地址錯誤',
+<<<<<<< HEAD
 		ScanQR: '掃描二維碼轉賬至資產',
+=======
+		ScanQR: '掃描二維碼以轉移到資產',
+>>>>>>> b5a6c0c02905415727eb685f944bf652207b8af9
 		Copyaddress: '複製地址',
 		CopySuccessful: '複製地址成功！',
 		// transfer
@@ -174,7 +178,11 @@ export default {
 		// backup5
 		Importviaprivatekey: '通過私鑰導入',
 		Privatekeyimportverification: '私鑰導入驗證',
+<<<<<<< HEAD
 		privatekeyanddo: '請輸入您的私鑰，不要洩露給他人，外部地址無法通過助記詞恢復。請妥善保管',
+=======
+		privatekeyanddo: '請輸入您的私鑰，不要將其洩露給其他人外部地址無法通過助記鍵恢復。 請妥善保管',
+>>>>>>> b5a6c0c02905415727eb685f944bf652207b8af9
 		enteryourprivatekey: '請輸入您的私鑰',
 		beempty: '不能為空',
 		beenimported: '錢包已經被導入',

utils/locales/zh.js

@@ -138,7 +138,11 @@ export default {
 		// sendToken index
 		Receivingaddress: '接收地址',
 		ReceivingaddressError: '接收地址错误',
+<<<<<<< HEAD
 		ScanQR: '扫描二维码转账至资产',
+=======
+		ScanQR: '扫描二维码以转移到资产',
+>>>>>>> b5a6c0c02905415727eb685f944bf652207b8af9
 		Copyaddress: '复制地址',
 		CopySuccessful: '复制地址成功！',
 		// transfer