代码

components/navigation/navigation.vue

@@ -78,8 +78,8 @@
 		margin-top: 80rpx;
 	}
 	.back{
-		width: 16rpx;
+		width: 30rpx;
-		height: 24rpx;
+		height: 30rpx;
 		position: absolute;
 		left:36rpx;
 	    top: 50%;

pages/menu/address/showKey/index.css

@@ -10,8 +10,8 @@
 }
 
 	.back{
-		width: 16rpx;
+		width: 30rpx;
-		height: 24rpx;
+		height: 30rpx;
 		position: absolute;
 		left:36rpx;
 	    top: 50%;

pages/menu/backUp/backUp4/index.vue

@@ -8,7 +8,7 @@
 					{{i18n.Mnemonicsimportverification}}
 			</view>
 			
-					<textarea v-model="wordInfo" class="textareaa" placeholder="Enter mnemonic words separated by spaces" placeholder-style="color:rgb(224,229,242)">
+					<textarea v-model="wordInfo" class="textareaa" :placeholder="teee" placeholder-style="color:rgb(224,229,242)">
 </textarea>
 			<u-button class="custom-style" @click="confirm">{{i18n.Confirm}}</u-button>
 
@@ -62,6 +62,7 @@
 	export default {
 		data() {
 			return {
+				teee:this.$t('index').separatedbyspaces,
 				mnemonics: [],
 				wordArr: [],
 				show: false,

pages/menu/backUp/backUpWord/index.css

@@ -1,6 +1,6 @@
 .back{
-		width: 16rpx;
+		width: 30rpx;
-		height: 24rpx;
+		height: 30rpx;
 		position: absolute;
 		left:36rpx;
 	    top: 50%;

pages/menu/collection/addCollection/index.css

@@ -60,8 +60,8 @@ page{
 	margin-left: 30rpx;
 }
 	.back{
-		width: 16rpx;
+		width: 30rpx;
-		height: 24rpx;
+		height: 30rpx;
 		position: absolute;
 		left:36rpx;
 	    top: 50%;

pages/menu/collection/collectionDetail/index.css

@@ -52,8 +52,8 @@ page{
 	width: 80rpx;
 }
 	.back{
-		width: 16rpx;
+		width: 30rpx;
-		height: 24rpx;
+		height: 30rpx;
 		position: absolute;
 		left:36rpx;
 	    top: 50%;

pages/menu/profile/index.vue

@@ -91,7 +91,7 @@
 		methods: {
 			goMatching() {
 				uni.showToast({
-					title: 'Not yet open',
+					title: this.$t('index').Notyetopen,
 					icon: 'none',
 					duration: 1500
 				})
@@ -103,7 +103,7 @@
 			},
 			goHelp() {
 				uni.showToast({
-					title: 'Not yet open',
+					title:this.$t('index').Notyetopen,
 					icon: 'none',
 					duration: 1500
 				})

pages/menu/sendToken/addAddress/index.vue

@@ -160,7 +160,6 @@
 			
 			handove2(item, index) {
 				this.value = item.name;
-				this.show = false;
 
 			},
 			showSave() {

pages/menu/sendToken/address/index.css

@@ -147,8 +147,8 @@ padding-bottom: 150rpx;
 	font-size: 32rpx;
 }
 	.back{
-		width: 16rpx;
+		width: 30rpx;
-		height: 24rpx;
+		height: 30rpx;
 		position: absolute;
 		left:36rpx;
 	    top: 50%;

pages/menu/sendToken/transfer/index.css

@@ -316,8 +316,8 @@
 		color: #6AD6A8 !important;
 	}
 	.back{
-		width: 16rpx;
+		width: 30rpx;
-		height: 24rpx;
+		height: 30rpx;
 		position: absolute;
 		left:36rpx;
 	    top: 50%;

pages/menu/setting/index.css

@@ -15,8 +15,8 @@
 	align-items: center;
 	}
 	.back{
-		width: 16rpx;
+		width: 30rpx;
-		height: 24rpx;
+		height: 30rpx;
 		position: absolute;
 		left:36rpx;
 	    top: 50%;

pages/menu/setting/index.vue

@@ -119,11 +119,13 @@
 				this.checked=false;
 				this.show=false;
 				this.printCancel();
+				
 			},
 			// 取消指纹识别
 			printCancel(){
 				this.show=false;
 				plus.fingerprint.cancel();
+				console.log(4545454545)
 				this.showFinger=false
 			},
 
@@ -195,27 +197,22 @@
 							plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框	
                                  // 指纹验证成功后走这里
 									// 存储设置里开启指纹后的状态，隐藏使用密码
-
 								uni.setStorageSync('fingerPass',true)
-								console.log(that.showFinger,454545)
 							that.showFinger=false;
 							that.fingerSuccess=true;
 							that.show=false;
-							console.log(that.showFinger,454545)
 						}, function(e) {
 							switch (e.code) {
 								case e.AUTHENTICATE_MISMATCH:
-									// plus.nativeUI.toast('Fingerprint matching failed, please re-enter');
+									plus.nativeUI.toast(that.$t('index').Fingerprintmatchingfailed);
 									uni.setStorageSync('fingerPass',false)
-										console.log(that.showFinger,454545)
 									that.showFinger=false;
 									that.fingerFail=true;
 									that.checked=false
-									console.log(that.fingerFail,454545)
 									break;
 								case e.AUTHENTICATE_OVERLIMIT:
 									plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框
-									// plus.nativeUI.alert('The number of fingerprint identification failures exceeds the limit. Please use other methods for authentication');
+									plus.nativeUI.alert('The number of fingerprint identification failures exceeds the limit. Please use other methods for authentication');
 									uni.setStorageSync('fingerPass',false)
 										console.log(that.showFinger,454545)
 									that.showFinger=false;
@@ -224,12 +221,13 @@
 									console.log(that.fingerFail,454545)
 									break;
 								case e.CANCEL:
-									plus.nativeUI.toast('Recognition has been cancelled');
+									plus.nativeUI.toast(that.$t('index').Recognitioncancelled);
 									uni.setStorageSync('fingerPass',false)
 										console.log(that.showFinger,454545)
 									that.showFinger=false;
 									that.checked=false
 									that.fingerFail=true;
+									that.show=false;
 									console.log(that.fingerFail,454545)
 									break;
 								default:
@@ -240,7 +238,7 @@
 									that.checked=false
 									that.fingerFail=true;
 									console.log(that.fingerFail,454545)
-									plus.nativeUI.alert('Fingerprint identification failed, please try again');
+									plus.nativeUI.alert(that.$t('index').Fingerprintidentificationfailed);
 									break;
 							}
 						});

pages/menu/token/btc/index.css

@@ -54,8 +54,8 @@
 	height: 110rpx;
 }
 .back{
-		width: 16rpx;
+		width: 30rpx;
-		height: 24rpx;
+		height: 30rpx;
 		position: absolute;
 		left:36rpx;
 	    top: 50%;

pages/menu/wallet/add/index.vue

@@ -33,7 +33,7 @@
 	<u-mask :show="show"  z-index="5"></u-mask>
 	<view class="bottom_con" v-if="show">
 		<image src="../../../../static/tongyonh/xg.png" mode="aspectFit" class="xg" @click="show = false"></image>
-		<view class="tiao"></view>
+		<view class="tiao"  @click="show = false"></view>
 		<view class="title">
 			{{title}}
 		</view>
@@ -81,6 +81,7 @@
 				console.log(item)
 				uni.navigateTo({
 					url:'../../../menu/backUp/index?name='+item
+		
 				})
 			},
 			goImportM(item){

pages/menu/wallet/cwallet/index.css

@@ -193,8 +193,8 @@
 	display: none !important;
 }
 	.back{
-		width: 16rpx;
+		width: 30rpx;
-		height: 24rpx;
+		height: 30rpx;
 		position: absolute;
 		left:36rpx;
 	    top: 50%;

pages/menu/wallet/cwallet/index.vue

@@ -71,7 +71,7 @@
 		},
 		methods: {
 			back(){
-				uni.navigateTo({
+			uni.redirectTo({
 				url:'../index'
 			})
 			},

pages/menu/wallet/index.css

@@ -9,6 +9,11 @@
 	/* #endif */
 	z-index: 999;
 }
+page{  
+       width: 100%;  
+       height: 100%;  
+       /* overflow: hidden;  */
+ }
 .renYou{
 	width: 36rpx;
 	height: 20rpx;
@@ -26,7 +31,8 @@
 }
 .main{
 	padding: 0 26rpx;
-	padding-bottom: 254rpx;
+	padding-bottom: 250rpx;
+	height: 100%;
 }
 .main .money_con{
 	margin-top: 32rpx;

pages/menu/wallet/mwallet/index.css

@@ -192,8 +192,8 @@
 	left: 0;
 }
 	.back{
-		width: 16rpx;
+		width: 30rpx;
-		height: 24rpx;
+		height: 30rpx;
 		position: absolute;
 		left:36rpx;
 	    top: 50%;

pages/menu/wallet/mwallet/index.vue

@@ -66,7 +66,7 @@
 		},
 		methods: {
 		back(){
-				uni.navigateTo({
+		uni.redirectTo({
 			url:'../cwallet/index'
 		})
 		},

pages/menu/wallet/mwallet/manage/index.css

@@ -108,8 +108,8 @@ word-break: break-word;
 
 }
 .back{
-		width: 16rpx;
+		width: 30rpx;
-		height: 24rpx;
+		height: 30rpx;
 		position: absolute;
 		left:36rpx;
 	    top: 50%;

pages/menu/wallet/otherCoin/index.css

@@ -58,8 +58,8 @@
 	word-break: break-word;
 }
 	.back{
-		width: 16rpx;
+		width: 30rpx;
-		height: 24rpx;
+		height: 30rpx;
 		position: absolute;
 		left:36rpx;
 	    top: 50%;

utils/TokenUtil.js

@@ -176,16 +176,26 @@ let token = {
 		return wallrtInfo;
 	},
 
+	// creatingWallets: function() {
+	// 	let mnemonic = this.generateMnemonic();
+	// 	let eth = this.generateEth(mnemonic);
+	// 	let tron = this.generateTron(mnemonic);
+	// 	let btc = this.generateBtc(mnemonic);
+	// 	// let privateKey = this.getPrivateKey(mnemonic);
+	// 	return {
+	// 		'eth': eth,
+	// 		'tron': tron,
+	// 		'btc': btc,
+	// 		'mnemonic': mnemonic,
+	// 		// 'privateKey': privateKey
+	// 	};
+	// },
 	creatingWallets: function() {
 		let mnemonic = this.generateMnemonic();
-		let eth = this.generateEth(mnemonic);
+		
-		let tron = this.generateTron(mnemonic);
-		let btc = this.generateBtc(mnemonic);
 		// let privateKey = this.getPrivateKey(mnemonic);
 		return {
-			'eth': eth,
+		
-			'tron': tron,
-			'btc': btc,
 			'mnemonic': mnemonic,
 			// 'privateKey': privateKey
 		};

utils/locales/en.js

@@ -207,5 +207,12 @@ export default {
 moreinformation:'Go to your browser for more information',
 	CopySuccessful:'Copy Successful!',
 	Nocontent:'No content',
+	
+	Recognitioncancelled:'Recognition has been cancelled',
+	Fingerprintidentificationfailed:'Fingerprint identification failed, please try again',
+	Fingerprintmatchingfailed:'Fingerprint matching failed, please re-enter',
+	Thenumberoffingerprint:'The number of fingerprint identification failures exceeds the limit. Please use other methods for authentication',
+	separatedbyspaces:'Enter mnemonic words separated by spaces',
+	Notyetopen:'Not yet open',
 	}
 }

utils/locales/zh-F.js

@@ -207,5 +207,11 @@ export default {
 		moreinformation:'有關詳細資訊，請轉到瀏覽器',
 			CopySuccessful:'複製成功！',
 			Nocontent:'無內容',
+			Recognitioncancelled:'已取消識別',
+			Fingerprintidentificationfailed:'指紋識別失敗，請重試',
+	Fingerprintmatchingfailed:'指紋匹配失敗，請重新輸入',
+	Thenumberoffingerprint:'指紋識別失敗的次數超過限制。 請使用其他方法進行身份驗證',
+	separatedbyspaces:'輸入以空格分隔的助記單詞',
+	Notyetopen:'暫未開放',
 	}
 }

utils/locales/zh.js

@@ -205,5 +205,11 @@ export default {
 	  moreinformation:'有关详细信息，请转到浏览器',
 	  	CopySuccessful:'复制成功！',
 		Nocontent:'无内容',
+		Recognitioncancelled:'已取消识别',
+		Fingerprintidentificationfailed:'指纹识别失败，请重试',
+		Fingerprintmatchingfailed:'指纹匹配失败，请重新输入',
+		Thenumberoffingerprint:'指纹识别失败的次数超过限制。请使用其他方法进行身份验证',
+	separatedbyspaces:'输入以空格分隔的助记单词',
+	Notyetopen:'暂未开放',
 	}
 }