1123

pages.json

@@ -20,7 +20,9 @@
 		{
 			"path": "pages/menu/token/btc/index",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true,
+				  "onReachBottomDistance": 10
 			}
 		},
 
@@ -56,7 +58,9 @@
 		{
 			"path": "pages/menu/collection/index",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true,
+				  "onReachBottomDistance": 10
 			}
 
 		},

pages/menu/collection/index.css

@@ -30,8 +30,6 @@ page {
 	background: #fff;
 	border-radius: 24rpx;
 	box-shadow: 0 18rpx 18rpx 18rpx #EAEDF0;
-	max-height: 1200rpx;
-	overflow-y: scroll;
 }
 
 .title {

pages/menu/collection/index.vue

@@ -5,7 +5,7 @@
 		</navigation>
 		<view class="big_con">
 		<view class="main">
-		<view class="main_con">
+		<scroll-view :scroll-y="true" class="main_con" style="max-height: 1080rpx;"  lower-threshold="50">
 			<view class="item flex" @click="showMsg(item,index)" v-for="item,index in collectinInfo" :key="index">
 				<view class="left flex2">
 					<image :src="item.projectIconUrlAbs" mode="aspectFit" class="img"></image>
@@ -25,7 +25,7 @@
 			</view>
 		
 		
-		</view>
+		</scroll-view>
 
 	<tab-bar :selectActive="2"></tab-bar>
 
@@ -101,13 +101,15 @@
 							return this.$t('index')
 						},
 					},
-		// onPullDownRefresh() {
+					
-		// 	console.log('refresh');
+		onPullDownRefresh() {
-		// 	this.getCollection();
+			console.log('refresh');
-		// 	setTimeout(function() {
+			this.getCollection();
-		// 		uni.stopPullDownRefresh();
+			setTimeout(function() {
-		// 	}, 500);
+				uni.stopPullDownRefresh();
-		// },
+			}, 500);
+		},
+		
 		methods: {
 			showMsg(item,index){
 				this.test=item

pages/menu/token/btc/index.vue

@@ -52,7 +52,7 @@
 					<u-tabs height="120" bar-width="172" active-font="13" inactive-font="13" active-color="#6F69FF"
 						inactive-color="#A3AED0" :list="list" :is-scroll="false" :current="current" @change="change">
 					</u-tabs>
-
+ 
 					<u-empty :text="teee" mode="list" v-if="showInfo"></u-empty>
 <scroll-view  v-if="!showInfo":scroll-y="true" style="max-height: 880rpx;" @scrolltolower="scrollToPage" lower-threshold="50">
 	<view class="item1" v-for="(item,index) in trxs" @click="goDetail(item,index)">
@@ -147,6 +147,13 @@
 				return this.$t('index')
 			},
 		},
+		onPullDownRefresh() {
+			console.log('refresh');
+			this.getWalletInfo();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 500);
+		},
 		methods: {
 			back() {
 				uni.reLaunch({

pages/menu/transction/detail/index.vue

@@ -68,7 +68,7 @@
 						</view>
 						<view class="text2">
 							{{info.toAddress}}
-							<image  @click="copyTextMethod(info.to)" src="../../../../static/tongyonh/copy_24px.png" mode="aspectFit" class="img"></image>
+							<image  @click="copyTextMethod(info.toAddress)" src="../../../../static/tongyonh/copy_24px.png" mode="aspectFit" class="img"></image>
 						</view>
 					</view>
 				</view>
@@ -137,11 +137,12 @@
 				// #ifdef APP-PLUS
 				var that = this
 				console.log(123132)
+				uni.hideToast();
 				uni.setClipboardData({
 					data: text,
 					success() {
 						uni.showToast({
-							title: this.$t('index').CopySuccessful,
+							title: that.$t('index').CopySuccessful,
 							icon: 'none',
 							duration: 1500
 						})

pages/menu/wallet/index.vue

@@ -112,7 +112,7 @@
 			uni.setStorageSync('isWallet', false);
 		},
 		async onLoad() {
-			
+			console.log('eth有走这吗')
 			let currency = uni.getStorageSync('currency');
 			if (currency) {
 				this.currency = currency;
@@ -122,7 +122,8 @@
 			//console.log(this.$TronUtil.decode("TBk72yKTJWppCsa7XrsU7Qhfo4yNvbm8rE"))
 			
 			this.userObj = uni.getStorageSync('wallet');
-			this.userObj = await this.$walletUtil.updateBalance();
+			this.userObj = await this.$walletUtil.updateBalance(); 
+			console.log('eth有走这吗')
 			uni.setStorageSync('isWallet', false);
 			// #ifdef APP-PLUS
 			this.appVersion()

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/3b988a30-4b80-11ec-9d4b-29472ed858a4
+https://ide.dcloud.net.cn/build/download/2b6dbb20-4b9b-11ec-83ec-c959e633baf4

utils/EthUtil.js

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

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: '我',