123

App.vue

@@ -111,6 +111,9 @@
 </script>
 
 <style lang="scss">
+	page{
+		margin-top: 80rpx;
+	}
 	button::after {
 		border: none;
 	}

components/navigation/navigation.vue

@@ -63,22 +63,22 @@
    
 	.nav-head{
 		height: 40rpx;
-		// background-color: #fff;
+		background-color: #fff;
 		text-align: center;
 		font-weight: 700;
 		font-size: 36rpx;
 		color: #000;
 		padding: 40rpx 16rpx;
-		margin-top: 50rpx;
+		// margin-top: 50rpx;
 		display: flex;
 		justify-content: center;
 		flex-direction: row-reverse;
 		align-items: center;
-		margin-top: 80rpx;
+		// margin-top: 80rpx;
 		position: sticky;
-		    top: 40px;
+		    top: 20px;
 		width: 100%;
-		z-index: 9999;
+		z-index: 8;
 		
 	}
 	.back{

pages/fingerPage/index.css

@@ -1,7 +1,10 @@
 page{
 	overflow-y: hidden;
 }
-
+.lans{
+	text-align: center;
+	margin-bottom:20rpx ;
+}
 .logo{
 	display: block;
 	margin: 0 auto;

pages/fingerPage/index.vue

@@ -5,27 +5,33 @@
         <view class="fingcon">
         	<image src="../../static/tongyonh/zhiwen.png" mode="aspectFit" class="finimg" @click="goFinger"></image>
                 <view class="te1">
-                	Click to verify fingerprint
+                	{{i18n.Clicktoverify}}
                 </view>
 		</view>
 	
 		<view class="passTex">
-			Login with wallet password
+			<view class="lans"  @click="show = true">
+						{{i18n.lans}}
 						</view>
+			{{i18n.Loginwith}}
+			
+			
+		</view>
+	
 		</view>
 		<u-mask z-index="10" :show="show"></u-mask>
 		
 		<view class="hou_jia" v-if="showFinger">
 			<view class="Log">
-				<!-- {{i18n.Login}} -->
+				{{i18n.Login}}
-				Log In
 			</view>
 			<image src="../../static/tongyonh/zww.png" mode="aspectFit" class="zzw" @click="goFinger()"></image>
 			<view class="Log" @click="cancel">
-				<!-- {{i18n.Cancel}} -->
+				{{i18n.Cancel}}
-				Cancel
 			</view>
 		</view>
+		<u-select :confirm-text="cnt"  :cancel-text="can" v-model="show" :list="list3" @confirm="confirm"></u-select>
+	
 	</view>
 
 </template>
@@ -35,15 +41,66 @@
 	export default {
 		data() {
 			return {
+				cnt:this.$t('index').Confirm,
+				can:this.$t('index').Cancel,
 				checked: false,
 				show: false,
 				showFinger: false,
 				fingerSuccess: false,
 				fingerFail: false,
 				hou_jia_w: false,
+				language: this.$store.state.language == 'en' ? 'English' : '简体中文',
+						show: false,
+				list3: [{
+						label: this.$t('index').langfan,
+						disabled: false,
+						value: "b",
+					},
+					{
+						label: this.$t('index').langjian,
+						disabled: false,
+						value: "a",
+					},
+					{
+						label: this.$t('index').eng,
+						disabled: false,
+						value: "c",
+					},
+				
+				],
 			};
 		},
 		methods: {
+			confirm(e){
+				 uni.setStorageSync('lang',e[0].value)	
+			
+				 if (e[0].value == 'c') {
+				 	this._i18n.locale = 'en'
+				 	this.$store.commit('setLanguage', 'en')
+				 	uni.setStorageSync('langTrue', 'English')
+				 	uni.setStorageSync("language", 'en')
+					 uni.redirectTo({
+					 	url:'/pages/fingerPage/index'
+					 })
+					
+				 } else if (e[0].value == 'a') {
+				 	this._i18n.locale = 'zh-CN'
+				 	this.$store.commit('setLanguage', 'zh-CN')
+				 	uni.setStorageSync("language", 'zh-CN')
+				 	uni.setStorageSync('langTrue', '简体中文')
+					 uni.redirectTo({
+					 	url:'/pages/fingerPage/index'
+					 })
+				 } else if (e[0].value == 'b'){
+				 	this._i18n.locale = 'zh-CNF'
+				 	this.$store.commit('setLanguage', 'zh-CNF')
+				 	uni.setStorageSync("language", 'zh-CNF')
+				 	uni.setStorageSync('langTrue', '繁體中文')
+					uni.redirectTo({
+						url:'/pages/fingerPage/index'
+					})
+				 }
+			},
 			goFinger(){
 				this.showFinger=true;
 				this.show=true;

pages/menu/backUp/backUp4/index.css

@@ -43,7 +43,6 @@
 	color: #7D87A6;
 }
 .main .textareaa{
-	width: 640rpx;
 	min-height: 364rpx;
 	border: 2rpx solid #E9EDF7;
 	border-radius: 10rpx;
@@ -51,6 +50,9 @@
 	padding: 20rpx;
 overflow: hidden;
 }
+/deep/ .u-input__textarea{
+	padding: 20rpx 20rpx !important;
+}
 .main .textareaa .item{
 	float: left;
 }
@@ -133,3 +135,20 @@ display: flex;
 	color: #fff;
 background-color: #5B53FF;
 }
+.scroll{
+	padding: 28rpx 0;
+	background-color: #FAFAFA;
+	display: flex;
+	justify-content:space-around;
+}
+.scroll .item{
+	line-height: 80rpx;
+	padding: 0 15rpx;
+	border-radius: 15rpx;
+	background-color: #fff;
+	text-align: center;
+	margin-left: 24rpx;
+}
+uni-scroll-view{
+	background-color: #FAFAFA;
+}

pages/menu/backUp/backUp4/index.vue

@@ -8,9 +8,9 @@
 				{{i18n.Mnemonicsimportverification}}
 			</view>
  
-			<textarea v-model="wordInfo" class="textareaa" :placeholder="teee"
+<u-input type="textarea" :clearable="false" v-model="wordInfo" @input="getmon()" :placeholder="teee" class="textareaa" placeholderStyle="color:rgb(224,229,242)"  
-				placeholder-style="color:rgb(224,229,242)">
+ :focus="foucStatus"  @blur="hideMon" />
-</textarea>
+
 			<u-button class="custom-style" @click="confirm">{{i18n.Confirm}}</u-button>
 
 
@@ -51,8 +51,18 @@
 			</view>
 			<u-mask :show="show" z-index="10"></u-mask>
 			<u-mask :show="show2" z-index="10"></u-mask>
+		</view>
+	<scroll-view  :scroll-x="true" class="" v-if="wordType">
+		<!-- @click="toWord(item)" -->
+		<view class="scroll">
+			<view class="item" v-for="item,index in worcon"  @touchend.prevent="toWord(item)">
+				{{item}}
+			</view>
+		
 		</view>
 				
+					</scroll-view>
+					<!-- <u-keyboard mode="car" v-model="show222"></u-keyboard> -->
 	</view>
 	</view>
 
@@ -63,6 +73,8 @@
 	export default {
 		data() {
 			return {
+				show222:'',
+				wordType:false,
 				teee: this.$t('index').separatedbyspaces,
 				mnemonics: [],
 				wordArr: [],
@@ -78,6 +90,13 @@
 				name: '',
 				typename: '',
 				info: {},
+				worcon:[],
+				keyUp:'',
+				foucStatus:false,
+				
+				
+				defaultPhoneHeight:'', //屏幕默认高度
+				nowPhoneHeight:'', //屏幕现在的高度
 			};
 		},
 		computed: {
@@ -86,6 +105,47 @@
 			},
 		},
 		methods: {
+		
+		nowPhoneHeight(){
+			if(this.defaultPhoneHeight != this.nowPhoneHeight){
+				//手机键盘被唤起了。
+		 
+		        //写软键盘唤起你需要做的操作
+		        //如this.tabbar = true
+			}else{
+				//手机键盘被关闭了。
+		        //写软键盘关闭你需要做的操作
+		       this.wordType=false
+			}
+		},
+			hideMon(){
+				this.wordType=false
+			},
+			getmon(){
+				console.log(this.wordInfo)
+				var ss = this.wordInfo.split(" ")
+				this.keyUp=ss[ss.length-1];
+				console.log(ss[ss.length-1],444)
+				this.worcon=this.$Token.searchMnemonic(ss[ss.length-1])
+				if(this.worcon.length>0){
+					this.wordType=true;
+				}else if(this.worcon.length==0){
+					uni.showToast({
+						title: '无效的助记词',
+						icon: 'none',
+						duration: 1500
+					})
+				}
+				console.log(this.worcon,444444)
+			},
+			toWord(item){
+		console.log(this.keyUp+item,78787878)
+				this.wordInfo+=item+' '
+				this.wordInfo=this.wordInfo.replace(this.keyUp+item,item)
+				this.keyUp='';
+				this.wordType=false
+				console.log(this.foucStatus,7878787878787787777777777)
+			},
 			// 成功去到设置交易密码
 			goTranPaw() {
 				uni.navigateTo({
@@ -166,7 +226,10 @@
 
 		},
 		onLoad(item) {
-
+this.defaultPhoneHeight = window.innerHeight
+window.onresize = ()=>{
+	this.nowPhoneHeight = window.innerHeight
+}
 			if (item != '' || item != undefined) {
 				uni.setStorageSync('createWalletName', item.name)
 			}

pages/menu/sendToken/transfer/index.css

@@ -247,7 +247,7 @@ input{
 		padding: 0 24rpx;
 		position: absolute;
 		z-index: 999;
-		bottom: -120rpx;
+		bottom: -350rpx;
 		    width: 100%;
 				padding-top: 24rpx;
 				padding-bottom: 100rpx;

pages/menu/transction/detail/index.css

@@ -1,3 +1,6 @@
+page{
+	overflow-y: hidden;
+}
 page{
 	height:100%;
 }

pages/menu/wallet/add/index.css

@@ -1,3 +1,8 @@
+	
+page{
+	overflow-y: hidden;
+}
+
 .renYou{
 	width: 36rpx;
 	height: 20rpx;

pages/menu/wallet/add/index.vue

@@ -30,7 +30,7 @@
 		
        </view>
 	</view>
-	<u-mask :show="show"  z-index="5"></u-mask>
+	<u-mask :show="show"  z-index="80"></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"  @click="show = false"></view>

pages/register/index.vue

@@ -169,16 +169,25 @@
 				 	this.$store.commit('setLanguage', 'en')
 				 	uni.setStorageSync('langTrue', 'English')
 				 	uni.setStorageSync("language", 'en')
+					uni.redirectTo({
+						url:'/pages/register/index'
+					})
 				 } else if (e[0].value == 'a') {
 				 	this._i18n.locale = 'zh-CN'
 				 	this.$store.commit('setLanguage', 'zh-CN')
 				 	uni.setStorageSync("language", 'zh-CN')
 				 	uni.setStorageSync('langTrue', '简体中文')
+					uni.redirectTo({
+						url:'/pages/register/index'
+					})
 				 } else if (e[0].value == 'b'){
 				 	this._i18n.locale = 'zh-CNF'
 				 	this.$store.commit('setLanguage', 'zh-CNF')
 				 	uni.setStorageSync("language", 'zh-CNF')
 				 	uni.setStorageSync('langTrue', '繁體中文')
+					uni.redirectTo({
+						url:'/pages/register/index'
+					})
 				 }
 			},
 			checkboxGroupChange() {

utils/TokenUtil.js

@@ -22,7 +22,7 @@ let token = {
 				 * index 数据的每一项下标
 				 * array 迭代的数组
 				 */
-				if(item.indexOf(str)>-1){
+				if(item.indexOf(str)==0){
 					list.push(item)
 				}
 				
@@ -32,7 +32,6 @@ let token = {
 		return list
 	},
 	entropyToMnemonic:function(src){
-		
 		const  mnemonic  =  bip39.entropyToMnemonic(src) 
 		
 	},

utils/locales/en.js

@@ -2,6 +2,8 @@
 export default {
 	index: {
 		// regis
+		Clicktoverify:'Click to verify fingerprint',
+		Loginwith:'Login with wallet password',
 		Decentralised:'Decentralised wallets,self-directed assets',
 		Localstorage:'Local storage of private keys, safe and secure',
 		Oneidentity:'One identity management',

utils/locales/zh-F.js

@@ -1,8 +1,9 @@
 // zhf.js
 export default {
 	index: {
-		
 		// regis
+		Clicktoverify:'點擊驗證指紋',
+		Loginwith:'使用錢包密碼登錄',
 		Decentralised:'去中心化錢包，自主資產',
 		Localstorage:'私鑰本地存儲，安全有保障',
 		Oneidentity:'身份管理',

utils/locales/zh.js

@@ -2,6 +2,8 @@
 export default {
 	index: {
 		// regis
+		Clicktoverify:'点击验证指纹',
+		Loginwith:'使用钱包密码登录',
 		Decentralised:'去中心化钱包，自主资产',
 		Localstorage:'私钥本地存储，安全有保障',
 		Oneidentity:'身份管理',