钱包工具类

.hbuilderx/launch.json

@@ -14,6 +14,10 @@
      	{
      		"launchtype" : "local"
      	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"type" : "uniCloud"
      }
     ]

pages/menu/about/Privacy/index.vue

@@ -4,16 +4,10 @@
 			{{i18n.TermsofService}}
 		</navigation>
 		<view class="con">
-		<view class="main">
-			<view class="">
-			Lorem text 	
-			</view>
 		
-			Dosuere at turpis at, fringilla efficitur quam. Suspendisse vitae lacus ac lectus facilisis ornare. Vivamus vitae pulvinar nisi, in vehicula elit. Praesent iaculis ante tellus, eu mattis lectus suscipit sit amet. Sed congue accumsan nunc in iaculis. Sed malesuada elit turpis, eu egestas eros rhoncus non. Sed pulvinar euismod libero sit amet scelerisque. Vestibulum ante felis, condimentum in vulputate id, tempor eu nulla. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Etiam condimentum augue vitae nulla suscipit eleifend. Phasellus consectetur volutpat nulla, cursus facilisis elit vulputate sed. Mauris in semper sem. Interdum et malesuada fames ac ante ipsum primis in faucibus.
-
-		</view>
 		<view class="main">
-			Etiam nisi lorem, posuere at turpis at, fringilla efficitur quam. Suspendisse vitae lacus ac lectus facilisis ornare. Vivamus vitae pulvinar nisi, in vehicula elit. Praesent iaculis ante tellus, eu mattis lectus suscipit sit amet. Sed congue accumsan nunc in iaculis. Sed malesuada elit turpis, eu egestas eros rhoncus non. Sed pulvinar euismod libero sit amet scelerisque. Vestibulum ante felis, condimentum in vulputate id, tempor eu nulla. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Etiam condimentum augue vitae nulla suscipit eleifend. Phasellus consectetur volutpat nulla, cursus facilisis elit vulputate sed. Mauris in semper sem. Interdum et malesuada fames ac ante ipsum primis in faucibus.
+			{{i18n.TermsofServiceTxt}}
+			
 		</view>
 			</view>
 	</view>

pages/menu/about/index.vue

@@ -16,7 +16,7 @@
 						{{i18n.Versionupdate}}
 					</view>
 					<view class="text2 gray">
-					v2.2.9
+						{{version}}
 					</view>
 				</view>
 				<view class="flex item">
@@ -32,17 +32,19 @@
 						{{i18n.TermsofService}}
 					</view>
 					<view class="text2 gray">
-					<image src="../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1"></image>
+						<image src="../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1">
+						</image>
 					</view>
 				</view>
-			<view class="flex item" @click="goPrivacy">
+				<!-- <view class="flex item" @click="goPrivacy">
 					<view class="text1">
 						{{i18n.PrivacyPolicy}}
 					</view>
 					<view class="text2 gray">
-				<image src="../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1"></image>
+						<image src="../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1">
-			</view>
+						</image>
 					</view>
+				</view> -->
 			</view>
 
 		</view>
@@ -55,7 +57,7 @@
 	export default {
 		data() {
 			return {
-			
+				version:'1.0.0'
 			};
 		},
 		computed: {
@@ -63,6 +65,11 @@
 				return this.$t('index')
 			},
 		},
+		onLoad() {
+			// #ifdef APP-PLUS
+				this.version=plus.runtime.versionName;
+			// #endif
+		},
 		methods: {
 			goTerms() {
 				uni.navigateTo({
@@ -82,7 +89,5 @@
 </style>
 
 <style>
-
 	@import './index.css';
-
 </style>

pages/menu/about/terms/index.vue

@@ -5,12 +5,10 @@
 		</navigation>
 		<view class="con">
 			<view class="main">
-			{{i18n.Etiamnisilorem1}}<br>
+
-			{{i18n.Etiamnisilorem2}}
+				{{i18n.TermsofServiceTxt}}
-		</view>
-		<view class="main">
-			{{i18n.Etiamnisilorem3}}
 			</view>
+
 		</view>
 	</view>
 
@@ -39,7 +37,5 @@
 </style>
 
 <style>
-
 	@import './index.css';
-
 </style>

pages/menu/collection/collectionDetail/index.vue

@@ -21,7 +21,7 @@
 					<text class="textleft">{{i18n.Contracts}}: </text>{{item.contract}}
 				</view>
 				<view class="top">
-					<text class="textleft texttt">{{i18n.ID}}: </text>{{item.id}}
+					<text class="textleft texttt">{{i18n.ID}}: </text>{{item.tonkenId}}
 				</view>
 			</view>
 		</view>

pages/menu/collection/collectionDetailtrue/index.vue

@@ -29,7 +29,7 @@
 			{{i18n.TokenID}}
 		</view>
 	<view class="text1one">
-			{{item.id}}
+			{{item.tonkenId}}
 	</view>
 	</view>
 	<view class="btn" @click="test">

pages/menu/market/index.css

@@ -1,6 +1,6 @@
 .main_con {
 	padding: 0 24rpx;
-	padding-bottom: 250rpx;
+	/* padding-bottom: 250rpx; */
 	margin-top: 80rpx;
 	position: relative;
 }

pages/menu/market/index.vue

@@ -26,7 +26,7 @@
 						</view>
 
 					</view>
-					<view class="btn " :class="item.change_percent>0?'red':'green'">
+					<view class="btn " :class="item.rose>0?'red':'green'">
 
 						{{item.rose>0?'+':''}}{{item.rose}}%
 					</view>

pages/menu/sendToken/addAddress/index.css

@@ -21,7 +21,9 @@
 	position: relative;
 	    padding-bottom: 52rpx;
 }
-
+input{
+	font-size: 26rpx;
+}
 .yuan{
 	width: 114rpx;
 	height: 114rpx;

pages/menu/sendToken/transfer/index.css

@@ -57,6 +57,9 @@
 	width: 85%;
 	position: relative;
 }
+input{
+	font-size: 26rpx;
+}
 .inputcon{
 	position: relative;
 }

pages/menu/sendToken/transfer/index.vue

@@ -608,6 +608,7 @@
 
 			goAddress(text) {
 				uni.setStorageSync('transInfoPass',this.transInfoPass)
+				uni.setStorageSync('sourcePage', '/pages/menu/sendToken/transfer/index');
 				uni.navigateTo({
 					url: '../address/index?item=transfer'
 				})
@@ -638,11 +639,11 @@
 				this.currency=currency;
 			}
 			if(this.currency==='USD'){
-				if (this.coin.balancePrice) {
+				if (this.coin.balancePrice&&this.coin.balancePrice>0) {
 					this.price = (this.coin.balancePrice / this.coin.balance).toFixed(2)
 				}
 			}else{
-				if (this.coin.balanceCnyPrice) {
+				if (this.coin.balanceCnyPrice&&this.coin.balancePrice>0) {
 					this.price = (this.coin.balanceCnyPrice / this.coin.balance).toFixed(2)
 				}
 			}

pages/menu/wallet/index.css

@@ -1,19 +1,4 @@
-.head{
+
-	/* background: #FAFAFA !important; */
-	position: sticky;
-	/* #ifdef H5 */
-	top: 80rpx;
-	/* #endif */
-	/* #ifndef H5 */
-	top: 0;
-	/* #endif */
-	z-index: 999;
-}
-page{  
-       width: 100%;  
-       height: 100%;  
-       /* overflow: hidden;  */
- }
 .renYou{
 	width: 36rpx;
 	height: 20rpx;
@@ -31,7 +16,7 @@ page{
 }
 .main{
 	padding: 0 26rpx;
-	padding-bottom: 250rpx;
+	/* padding-bottom: 250rpx; */
 	height: 100%;
 }
 .main .money_con{
@@ -119,10 +104,22 @@ page{
 	justify-content: space-between;
 	align-items: center;
 }
+
 .bot_con .item .left .img1{
 	width: 84rpx;
 	height: 84rpx;
 	margin-right: 20rpx;
+	border-radius: 100px;
+	border: 1rpx solid #F0F0F0;
+	
+}
+.icon{
+	width: 70%;
+	height: 70%;
+	margin-top: 15%;
+	border-radius: 100px;
+	margin-left: 15%;
+	
 }
 .bot_con .item .left .textcon .text1{
 	font-size: 30rpx;

pages/menu/wallet/index.vue

@@ -48,7 +48,10 @@
 				<view class="scroll">
 					<view class="item flexx" @click="goTrans(item,index)" v-for="item,index in this.userObj.coinList">
 						<view class="left flex ">
-							<image :src="item.icon" mode="aspectFit" class="img1"></image>
+							<view class="img1">
+								<image :src="item.icon" mode="aspectFit" class="icon"></image>
+							</view>
+
 							<view class="textcon">
 								<view class="text1">
 									{{item.name}}
@@ -64,7 +67,8 @@
 							</view>
 							<view class="text2" v-if="item.balancePrice">
 
-								≈ {{currency=='USD'?'$ '+(!item.balancePrice?0.00:item.balancePrice):'￥ '+(!item.balanceCnyPrice?0.00:item.balanceCnyPrice)}}
+								≈
+								{{currency=='USD'?'$ '+(!item.balancePrice?0.00:item.balancePrice):'￥ '+(!item.balanceCnyPrice?0.00:item.balanceCnyPrice)}}
 							</view>
 							<view class="text2" v-if="!item.balancePrice">
 								≈ $ 0.00
@@ -104,17 +108,25 @@
 		},
 		onUnload: function() {
 			this.isStop = true
+			uni.setStorageSync('isWallet', false);
 		},
-		onLoad() {
+		async onLoad() {
+			
 			let currency = uni.getStorageSync('currency');
 			if (currency) {
 				this.currency = currency;
 			}
+			uni.setStorageSync('isWallet', true);
 			// 拿钱包
-			this.$walletUtil.updateBalance();
-			this.userObj = uni.getStorageSync('wallet');
 			
 			
+			this.userObj = uni.getStorageSync('wallet');
+			this.userObj = await this.$walletUtil.updateBalance();
+			uni.setStorageSync('isWallet', false);
+			// #ifdef APP-PLUS
+			this.appVersion()
+			// #endif
+
 
 		},
 		computed: {
@@ -130,6 +142,31 @@
 		// 	}, 500);
 		// },
 		methods: {
+			async appVersion() {
+				let param = {
+					'appId': uni.getSystemInfoSync().platform
+				}
+				console.log('ss' + this.$api)
+				const response = await this.$api.versionUpgrade(param)
+				plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+					console.log('当前版本号' + wgtinfo.versionCode)
+					
+					console.log((wgtinfo.versionCode < response.data.versionId))
+					if (wgtinfo.versionCode < response.data.versionId) {
+						let that=this;
+						// uni.showModal({
+						// 	title: that.i18n.updateTitle,
+						// 	content: that.i18n.updateMsg,
+						// 	success: function (res) {
+						// 		if (res.confirm) {
+						// 			plus.runtime.openURL(response.data.appUrl);
+						// 		}
+						// 	}
+						// });
+						
+					} 
+				});
+			},
 			goOther() {
 
 				uni.navigateTo({

pages/menu/wallet/otherCoin/index.css

@@ -1,21 +1,22 @@
 .maintoP {
 	margin-top: 100rpx;
 }
+
 .aaa {
 	display: block;
 }
-	page {
+
-	height: 100%;
-	}
 .main_con {
 	max-height: 1000rpx;
 	overflow-y: scroll;
 }
+
 .main {
 	padding: 0 24rpx;
 	margin-top: 30rpx;
 	background: #fff;
 }
+
 .title {
 	height: 160rpx;
 	display: flex;
@@ -23,11 +24,13 @@
 	font-size: 32rpx;
 	border-bottom: 2rpx solid #F6F8FD;
 }
+
 .flex {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
 }
+
 .flex2 {
 	display: flex;
 }
@@ -36,27 +39,33 @@
 	width: 80rpx;
 	height: 80rpx;
 }
+
 .main_con .item {
 	height: 160rpx;
 	border-bottom: 2rpx solid #F6F8FD;
 	border-radius: 24rpx;
 
 }
+
 .main_con .item .img {
 	width: 48rpx;
 	height: 48rpx;
 }
+
 .main_con .textcon {
 	margin-left: 20rpx;
 }
+
 .main_con .textcon .text1 {
 	font-size: 30rpx;
 }
+
 .main_con .textcon .text2 {
 	font-size: 24rpx;
 	color: #999;
 	word-break: break-word;
 }
+
 .back {
 	width: 30rpx;
 	height: 30rpx;
@@ -65,20 +74,24 @@
 	top: 50%;
 	transform: translateY(-50%);
 }
+
 .opci {
 	opacity: 0.5;
 }
+
 .topview {
 	background-color: #FAFAFA;
 	width: 100%;
 	border-radius: 32rpx;
 	position: relative;
 }
+
 .topinput {
 	width: 100%;
 	height: 70rpx;
 	padding-left: 100rpx;
 }
+
 .searchimg {
 	width: 48rpx;
 	height: 48rpx;
@@ -103,23 +116,28 @@
 	color: #fff;
 	transition: .8s all;
 }
+
 .goTop {
 	position: fixed;
 	bottom: 60rpx !important;
 }
+
 .green {
 	background-color: #6AD6A8;
 }
-.info_con .text{
+
-}
+.info_con .text {}
+
 .info_con .text2 {
 	font-size: 700;
 	font-size: 32rpx;
 }
+
 .goTop {
 	position: fixed;
 	bottom: 60rpx !important;
 }
+
 .copyImg {
 	width: 48rpx;
 	height: 48rpx;

pages/menu/wallet/otherCoin/index.vue

@@ -15,6 +15,7 @@
 		<view class="main_con">
 			<view class="item flex" v-for="item,index in coinInfo" :key="index">
 				<view class="left flex2">
+					
 					<image :src="item.contractIconUrlAbs" mode="aspectFit" class="img"></image>
 				    <view class="textcon">
 				    	<view class="text1">

utils/EthUtil.js

@@ -82,13 +82,15 @@ let eth = {
 
 		
 		let res =await uni.request({
-			url: 'https://mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161', //仅为示例，并非真实接口地址。
+			url: systemConfiguration.constant.ethNode, //仅为示例，并非真实接口地址。
 			method: 'POST',
 			data: data,
 			dataType: 'json'
 		});
-		
+		let resData=res[res.length-1];
-		let balance = Number(web3.utils.hexToNumberString(res['data']['result'])) / Math.pow(10, 18)
+		console.log(resData,5555555555)
+		let balance = Number(web3.utils.hexToNumberString(resData.data.result)) / Math.pow(10, 18)
+		console.log(balance,'balance')
 		return balance;
 	},
 

utils/WalletUtil.js

@@ -224,14 +224,16 @@ let WalletUtil = {
 				wallet.balance = await BtcUtil.getBalance(wallet.address)
 				break;
 			case 'ETH':
-				console.log("进来ETH")
+				console.log("进来ETH",wallet.balance )
 				wallet.balance = await EthUtil.getBalance(wallet.address);
+				console.log("进来ETH",wallet.balance )
 				for (let i = 1; i < wallet.coinList.length; i++) {
-					wallet.coinList[i].balance = EthUtil.getTokenBalance(wallet.address, wallet.coinList[
+					wallet.coinList[i].balance = await EthUtil.getTokenBalance(wallet.address, wallet.coinList[i].contractAddress);
-						i].contractAddress);
+						console.log("进来ETH",wallet.coinList[i].balance)
+						
 				}
-				wallet.totalBalancePrice = wallet.coinList[1].balancePrice
+				wallet.totalBalancePrice = wallet.coinList[1].balancePrice?wallet.coinList[1].balancePrice:0;
-				wallet.totalBalanceCnyPrice=wallet.coinList[1].balanceCnyPrice
+				wallet.totalBalanceCnyPrice=wallet.coinList[1].balanceCnyPrice?wallet.coinList[1].balanceCnyPrice:0;
 				wallet.coinList[1].balancePrice = (wallet
 					.coinList[1].balance * usdtU.data.priceInUsd).toFixed(2);
 				wallet.coinList[1].balanceCnyPrice = (wallet
@@ -280,10 +282,13 @@ let WalletUtil = {
 
 		}
 
+
 		wallet.balancePrice = (wallet.balance * mainCoinP.data.priceInUsd).toFixed(2);
 		wallet.balanceCnyPrice = (wallet.balance * mainCoinP.data.priceCny).toFixed(2);
 		wallet.totalBalancePrice=(Number(wallet.totalBalancePrice)+Number(wallet.balancePrice)).toFixed(2);
 		wallet.totalBalanceCnyPrice=(Number(wallet.totalBalanceCnyPrice)+Number(wallet.balanceCnyPrice)).toFixed(2);
+		console.log("wallet.balancePrice",Number(wallet.totalBalancePrice))
+		console.log("wallet.balanceCnyPrice",wallet.totalBalancePrice)
 		wallet.coinList[0].balance = wallet.balance
 		wallet.coinList[0].balancePrice = wallet.balancePrice
 		wallet.coinList[0].balanceCnyPrice = wallet.balanceCnyPrice

utils/api.js

@@ -12,9 +12,9 @@ const api = {
 	getCoinRate: (params) => Vue.prototype.$axios.get('/api/coinRate/getCoinRate?' + qs.stringify(params)),
 	getChainDataList: (params) => Vue.prototype.$axios.get('/api/chainData/getChainDataList?' + qs.stringify(params)),
 	getCoinTickerList: (params) => Vue.prototype.$axios.get('/api/coinTicker/getCoinTickerList'),
-	getBalance: (params) => Vue.prototype.$axios.get('/api/balance/getBalance?' + qs.stringify(params))
+	getBalance: (params) => Vue.prototype.$axios.get('/api/balance/getBalance?' + qs.stringify(params)),
+	versionUpgrade: (params) => Vue.prototype.$axios.get('/api/home/versionUpgrade?' + qs.stringify(params))
 	//--------------------------------- free ---------------------------------
-
 }
 
 

utils/axios.js

@@ -15,10 +15,15 @@ service.interceptors.request.use(
 	config => {
 		
 		console.log(config)
+		let isWallet= uni.getStorageSync('isWallet');
+		console.log(isWallet,55555)
+		if(!isWallet){
 			uni.showLoading({
 				title: 'loading',
 				mask: true
 			})
+		}
+		
 		console.log('============================')
 		// if (config.urlType=='eth') {
 		// 	config.url = config.url

utils/locales/en.js

@@ -220,5 +220,8 @@ moreinformation:'Go to your browser for more information',
 		yourcredit: 'Sorry, your credit is running low',
 		addresserror: 'address error',
 		offchain: 'Please enter a note (off-chain)',
+		TermsofServiceTxt:'This "Service Agreement" ("Agreement" or "Service Agreement") contains the terms and conditions governing your access and use of the websites and services (defined below) provided by us, and is between us and you or the entity you represent protocol. Please read this "Service Agreement" carefully before using this website or service. By using this website, or by clicking a button or check box to accept or agree to the terms of service of this "Service Agreement" (if this option is available), or fill in a service order, or, if earlier, use or otherwise access the service ("Effective Date"), you (1) accept and agree to this "Service Agreement" and any additional terms, rules and participation conditions that we publish from time to time, and (2) agree to the collection as described in our "Privacy Policy" , Use, disclosure, and other information processing activities. If you do not agree to this Service Agreement, you may not access or use the service.',
+		updateTitle:'Version upgrade prompt',
+		updateMsg:'A new version is found, do you want to update it?'
 	}
 }

utils/locales/zh-F.js

@@ -32,7 +32,7 @@ export default {
 		helpcen: '幫助中心',
 		aboutus: '關於我們',
 		Hardware: '硬體',
-			math:'配套硬體',
+		math: '配對硬體',
 		// wallet
 		Wallet: '錢包',
 		assets: '資產',
@@ -82,7 +82,6 @@ export default {
 		Etiamnisilorem2: '',
 		Etiamnisilorem3: '',
 		// privacy
-				TermsofService:'隱私政策',
 		// manage
 		Address: '地址',
 		Manage: '管理',
@@ -219,5 +218,8 @@ export default {
 		yourcredit: '餘額不足',
 		addresserror: '地址錯誤',
 		offchain: '請輸入注釋（鏈外）',
+		TermsofServiceTxt:'本《服務協議》（“協議”或“服務協議”）包含管理您訪問和使用我們提供的網站和服務（定義如下）的條款和條件，並且是我們與您或您所代表的實體之間的協議。在使用本網站或服務之前，請仔細閱讀本《服務協議》。通過使用本網站，或單擊按鈕或複選框以接受或同意本《服務協議》的服務條款（如有該選項），或者填寫服務訂單，或者，如果更早，使用或以其他方式訪問服務（“生效日期”），您(1)接受並同意本《服務協議》以及我們不時發布的任何附加條款、規則和參與條件，以及(2)同意如我們的《隱私政策》中所述的收集、使用、披露和其他處理信息的活動。如果您不同意本《服務協議》，則您不得訪問或使用服務。',
+		updateTitle:'版本升級提示',
+		updateMsg:'發現新版本，是否更新？'
 	}
 }

utils/locales/zh.js

@@ -32,7 +32,7 @@ export default {
 		helpcen: '帮助中心',
 		aboutus: '关于我们',
 		Hardware: '硬件',
-		math:'配套硬件',
+		math: '配对硬件',
 		// wallet
 		Wallet: '钱包',
 		assets: '资产',
@@ -81,7 +81,6 @@ export default {
 		Etiamnisilorem2: '',
 		Etiamnisilorem3: '',
 		// privacy
-			TermsofService:'隐私政策',
 		// manage
 		Address: '地址',
 		Manage: '管理',
@@ -217,5 +216,8 @@ export default {
 		yourcredit: '余额不足',
 		addresserror: '地址错误',
 		offchain: '请输入注释（链外）',
+		TermsofServiceTxt:'本《服务协议》（“协议”或“服务协议”）包含管理您访问和使用我们提供的网站和服务（定义如下）的条款和条件，并且是我们与您或您所代表的实体之间的协议。在使用本网站或服务之前，请仔细阅读本《服务协议》。通过使用本网站，或单击按钮或复选框以接受或同意本《服务协议》的服务条款（如有该选项），或者填写服务订单，或者，如果更早，使用或以其他方式访问服务（“生效日期”），您(1)接受并同意本《服务协议》以及我们不时发布的任何附加条款、规则和参与条件，以及(2)同意如我们的《隐私政策》中所述的收集、使用、披露和其他处理信息的活动。如果您不同意本《服务协议》，则您不得访问或使用服务。',
+		updateTitle:'版本升级提示',
+		updateMsg:'发现新版本，是否更新？'
 	}
 }