添加跳往交易详情

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');
-		// 	this.getCollection();
-		// 	setTimeout(function() {
-		// 		uni.stopPullDownRefresh();
-		// 	}, 500);
-		// },
+					
+		onPullDownRefresh() {
+			console.log('refresh');
+			this.getCollection();
+			setTimeout(function() {
+				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,11 +68,11 @@
 						</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>
-				<view class="item goto">
+				<view class="item goto" @click="toDetail">
 					{{i18n.moreinformation}}
 				</view>
 				<!-- <view class="sett" v-if="show">
@@ -121,6 +121,22 @@
 			},
 		},
 		methods: {
+			toDetail(){
+				let url;
+				if(this.info.chainName=='TRX'){
+					url =this.$SystemConfiguration.constant.trxTransctionDetail +this.info.txid;
+				}else if(this.info.chainName=='ETH'){
+					url =this.$SystemConfiguration.constant.ethTransctionDetail +this.info.txid;
+				}
+				// #ifdef H5
+					window.location.href = url;
+					
+				// #endif
+				// #ifdef APP-PLUS
+					plus.runtime.openURL(url)
+				// #endif
+				
+			},
 			copyTextMethod(text) {
 				console.log(text)
 				// #ifdef H5
@@ -137,11 +153,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

@@ -111,6 +111,7 @@
 			this.isStop = true
 			uni.setStorageSync('isWallet', false);
 		},
+		
 		onLoad() {
 			
 			let currency = uni.getStorageSync('currency');
@@ -121,6 +122,7 @@
 			// 拿钱包
 			//console.log(this.$TronUtil.decode("TBk72yKTJWppCsa7XrsU7Qhfo4yNvbm8rE"))
 			this.userObj = uni.getStorageSync('wallet');
+			console.log('eth有走这吗')
 			this.updateBalance();
 			uni.setStorageSync('isWallet', false);
 			// #ifdef APP-PLUS

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

@@ -12,7 +12,7 @@ if (typeof web3 !== 'undefined') {
 
 
 let eth = {
-	//获取主币eth余额
+	// //获取主币eth余额
 	// getBalance: async function(address) {
 	// 	console.log("查询余额：",address)
 	// 	let balance = 0;
@@ -25,6 +25,12 @@ let eth = {
 	// 	}
 	// 	return Number(balance) / Math.pow(10, 18);
 	// },
+	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)

utils/SystemConfiguration.js

@@ -5,13 +5,17 @@ const constant = isTest ? {
 	serverUrl: 'http://wallet-api.weirui0755.com',
 	coinTickerWs:'ws://wallet-quartz.weirui0755.com/websocket',
 	ethNode:'http://47.245.25.82:8545',
-	ethChainId:1
+	ethChainId:1,
+	ethTransctionDetail:'https://cn.etherscan.com/tx/',
+	trxTransctionDetail:'https://tronscan.io/#/transaction/'
 } : {
 	//服务端连接
 	serverUrl: 'http://wallet-api.weirui0755.com',
 	coinTickerWs:'ws://wallet-quartz.weirui0755.com/websocket',
 	ethNode:'http://47.245.25.82:8545',
-	ethChainId:3
+	ethChainId:3,
+	ethTransctionDetail:'https://cn.etherscan.com/tx/',
+	trxTransctionDetail:'https://tronscan.io/#/transaction/'
 }
 
 export default {