密码

App.vue

@@ -4,7 +4,7 @@
 		max-width: 828rpx; //最大宽度自己可以调整
 		margin: auto !important;
 	}
-
+	page{margin-top:50rpx}
 	/*  #endif  */
 	@import "uview-ui/index.scss";
 </style>

components/navigation/navigation.vue

@@ -63,7 +63,7 @@
    
 	.nav-head{
 		height: 40rpx;
-		background-color: #fff;
+		background-color: #fafafa;
 		text-align: center;
 		font-weight: 700;
 		font-size: 36rpx;
@@ -76,7 +76,7 @@
 		align-items: center;
 		// margin-top: 80rpx;
 		position: sticky;
-		    top: 20px;
+		top: 40rpx;
 		width: 100%;
 		z-index: 8;
 		

pages.json

@@ -3,12 +3,18 @@
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		// {
+		// 	"path": "pages/index",
+		// 	"style": {
+		// 		"navigationStyle": "custom"
+		// 	}
+		
+		// },
 		{
-			"path": "pages/index",
+			"path": "pages/fingerPage/index",
 			"style": {
 				"navigationStyle": "custom"
 			}
-		
 		},
 		{
 			"path": "pages/register/index",
@@ -17,12 +23,7 @@
 			}
 		
 		},
-		{
+		
-			"path": "pages/fingerPage/index",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/fingerPage/password/index",
 			"style": {

pages/fingerPage/index.vue

@@ -41,8 +41,8 @@
 	export default {
 		data() {
 			return {
-				cnt:this.$t('index').Confirm,
+				cnt: this.$t('index').Confirm,
-				can:this.$t('index').Cancel,
+				can: this.$t('index').Cancel,
 				checked: false,
 				show: false,
 				showFinger: false,
@@ -78,8 +78,8 @@
 				})
 				console.log(123456465)
 			},
-			confirm(e){
+			confirm(e) {
-				 uni.setStorageSync('lang',e[0].value)	
+				uni.setStorageSync('lang', e[0].value)
 
 				if (e[0].value == 'c') {
 					this._i18n.locale = 'en'
@@ -87,7 +87,7 @@
 					uni.setStorageSync('langTrue', 'English')
 					uni.setStorageSync("language", 'en')
 					uni.redirectTo({
-					 	url:'/pages/fingerPage/index'
+						url: '/pages/fingerPage/index'
 					})
 
 				} else if (e[0].value == 'a') {
@@ -96,21 +96,21 @@
 					uni.setStorageSync("language", 'zh-CN')
 					uni.setStorageSync('langTrue', '简体中文')
 					uni.redirectTo({
-					 	url:'/pages/fingerPage/index'
+						url: '/pages/fingerPage/index'
 					})
-				 } else if (e[0].value == 'b'){
+				} 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'
+						url: '/pages/fingerPage/index'
 					})
 				}
 			},
-			goFinger(){
+			goFinger() {
-				this.showFinger=true;
+				this.showFinger = true;
-				this.show=true;
+				this.show = true;
 				this.fingerPass()
 			},
 			// 依旧保留指纹
@@ -138,7 +138,7 @@
 			printCancel() {
 				this.show = false;
 				this.showFinger = false
-						console.log(this.showFinger,777777777777)
+				console.log(this.showFinger, 777777777777)
 				plus.fingerprint.cancel();
 			},
 
@@ -203,7 +203,7 @@
 						that.fingerSuccess = true;
 						that.show = false;
 						uni.reLaunch({
-									url:'/pages/menu/wallet/index'
+							url: '/pages/menu/wallet/index'
 						})
 					}, function(e) {
 						// 指纹识别失败后的各种情况
@@ -211,35 +211,35 @@
 							case e.AUTHENTICATE_MISMATCH:
 								plus.nativeUI.toast(that.$t('index').Fingerprintmatchingfailed);
 								// uni.setStorageSync('fingerPass',false)
-									that.showFinger=false;
+								that.showFinger = false;
-									that.fingerFail=true;
+								that.fingerFail = true;
-									that.checked=false
+								that.checked = false
-									that.show=false;
+								that.show = false;
 								break;
 							case e.AUTHENTICATE_OVERLIMIT:
 								plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框
 								plus.nativeUI.alert(that.$t('index').Thenumberoffingerprint);
 								// uni.setStorageSync('fingerPass',false)
-									that.showFinger=false;
+								that.showFinger = false;
-									that.fingerFail=true;
+								that.fingerFail = true;
-									that.checked=false
+								that.checked = false
-									that.show=false;
+								that.show = false;
 								break;
 							case e.CANCEL:
 								plus.nativeUI.toast(that.$t('index').Recognitioncancelled);
 								// uni.setStorageSync('fingerPass',false)
-									that.showFinger=false;
+								that.showFinger = false;
-									that.checked=false
+								that.checked = false
-									that.fingerFail=true;
+								that.fingerFail = true;
-									that.show=false;
+								that.show = false;
 								break;
 							default:
 								plus.nativeUI.closeWaiting(); //兼容Android平台关闭等待框
 								// uni.setStorageSync('fingerPass',false)
-									that.showFinger=false;
+								that.showFinger = false;
-									that.checked=false
+								that.checked = false
-									that.show=false;
+								that.show = false;
-									that.fingerFail=true;
+								that.fingerFail = true;
 								plus.nativeUI.alert(that.$t('index').Fingerprintidentificationfailed);
 								break;
 						}
@@ -262,11 +262,32 @@
 		},
 		onLoad() {
 			// 每次进来拿缓存里有没有指纹
+			let fingerPass=uni.getStorageSync('fingerPass');
+			console.log(fingerPass,"fingerPass")
 			if (uni.getStorageSync('fingerPass')) {
-				this.showFinger=true;
+				this.showFinger = true;
-				this.show=true;
+				this.show = true;
 				this.fingerPass()
 			}
+			let walletInfo= uni.getStorageSync('walletInfo');
+			if (!walletInfo || walletInfo == '') {
+
+				uni.reLaunch({
+					url: '/pages/register/index'
+				})
+			} else {
+				// #ifdef APP-PLUS
+				// 指纹 
+				if (!uni.getStorageSync('fingerPass')) {
+					uni.reLaunch({
+						url: '/pages/fingerPage/password/index'
+					})
+					
+					return;
+				}
+				// #endif
+				
+			}
 
 
 

pages/menu/backUp/backUp4/index.vue

@@ -8,8 +8,8 @@
 				{{i18n.Mnemonicsimportverification}}
 			</view>
 
-<u-input type="textarea" :clearable="false" v-model="wordInfo" @input="getmon()" :placeholder="teee" class="textareaa" placeholderStyle="color:rgb(224,229,242)"  
+			<u-input type="textarea" :clearable="false" v-model="wordInfo" @input="getmon()" :placeholder="teee"
- :focus="foucStatus"  @blur="hideMon" />
+				class="textareaa" placeholderStyle="color:rgb(224,229,242)" :focus="foucStatus" @blur="hideMon" />
 
 			<u-button class="custom-style" @click="confirm">{{i18n.Confirm}}</u-button>
 
@@ -73,8 +73,8 @@
 	export default {
 		data() {
 			return {
-				show222:'',
+				show222: '',
-				wordType:false,
+				wordType: false,
 				teee: this.$t('index').separatedbyspaces,
 				mnemonics: [],
 				wordArr: [],
@@ -90,13 +90,13 @@
 				name: '',
 				typename: '',
 				info: {},
-				worcon:[],
+				worcon: [],
-				keyUp:'',
+				keyUp: '',
-				foucStatus:false,
+				foucStatus: false,
 
 
-				defaultPhoneHeight:'', //屏幕默认高度
+				defaultPhoneHeight: '', //屏幕默认高度
-				nowPhoneHeight:'', //屏幕现在的高度
+				nowPhoneHeight: '', //屏幕现在的高度
 			};
 		},
 		computed: {
@@ -106,45 +106,45 @@
 		},
 		methods: {
 
-		nowPhoneHeight(){
+			nowPhoneHeight() {
-			if(this.defaultPhoneHeight != this.nowPhoneHeight){
+				if (this.defaultPhoneHeight != this.nowPhoneHeight) {
 					//手机键盘被唤起了。
 
 					//写软键盘唤起你需要做的操作
 					//如this.tabbar = true
-			}else{
+				} else {
 					//手机键盘被关闭了。
 					//写软键盘关闭你需要做的操作
-		       this.wordType=false
+					this.wordType = false
 				}
 			},
-			hideMon(){
+			hideMon() {
-				this.wordType=false
+				this.wordType = false
 			},
-			getmon(){
+			getmon() {
 				console.log(this.wordInfo)
 				var ss = this.wordInfo.split(" ")
-				this.keyUp=ss[ss.length-1];
+				this.keyUp = ss[ss.length - 1];
-				console.log(ss[ss.length-1],444)
+				console.log(ss[ss.length - 1], 444)
-				this.worcon=this.$Token.searchMnemonic(ss[ss.length-1])
+				this.worcon = this.$Token.searchMnemonic(ss[ss.length - 1])
-				if(this.worcon.length>0){
+				if (this.worcon.length > 0) {
-					this.wordType=true;
+					this.wordType = true;
-				}else if(this.worcon.length==0){
+				} else if (this.worcon.length == 0) {
 					uni.showToast({
 						title: '无效的助记词',
 						icon: 'none',
 						duration: 1500
 					})
 				}
-				console.log(this.worcon,444444)
+				console.log(this.worcon, 444444)
 			},
-			toWord(item){
+			toWord(item) {
-		console.log(this.keyUp+item,78787878)
+				console.log(this.keyUp + item, 78787878)
-				this.wordInfo+=item+' '
+				this.wordInfo += item + ' '
-				this.wordInfo=this.wordInfo.replace(this.keyUp+item,item)
+				this.wordInfo = this.wordInfo.replace(this.keyUp + item, item)
-				this.keyUp='';
+				this.keyUp = '';
-				this.wordType=false
+				this.wordType = false
-				console.log(this.foucStatus,7878787878787787777777777)
+				console.log(this.foucStatus, 7878787878787787777777777)
 			},
 			// 成功去到设置交易密码
 			goTranPaw() {
@@ -160,18 +160,7 @@
 			},
 			// 提交
 			confirm() {
-				if(this.wordInfo==''){
+				if (this.wordInfo == '') {
-					uni.showToast({
-						title: this.$t('index').MnemonicsError,
-						icon: 'none',
-						duration: 1500
-					})
-					return;
-				}
-				this.typename=uni.getStorageSync('createWalletName')
-				if(!this.typename){
-				
-					if(this.wordInfo.split(" ").length%12!=0){
 					uni.showToast({
 						title: this.$t('index').MnemonicsError,
 						icon: 'none',
@@ -179,12 +168,14 @@
 					})
 					return;
 				}
+				this.typename = uni.getStorageSync('createWalletName')
+				if (!this.typename) {
 					uni.setStorageSync('word', this.wordInfo);
 					uni.navigateTo({
 						url: '/pages/menu/backUp/transPaw/index'
 					})
 
-				}else{
+				} else {
 					this.walletInfo = uni.getStorageSync('walletInfo');
 					console.log(this.walletInfo, 123654)
 					if (this.wordInfo == null) {
@@ -226,11 +217,11 @@
 
 		},
 		onLoad(item) {
-this.defaultPhoneHeight = window.innerHeight
+			this.defaultPhoneHeight = window.innerHeight
-window.onresize = ()=>{
+			window.onresize = () => {
 				this.nowPhoneHeight = window.innerHeight
-}
+			}
-			if (item != '' || item != undefined) {
+			if (item != '' && item != undefined) {
 				uni.setStorageSync('createWalletName', item.name)
 			}
 		},

pages/menu/backUp/transPaw/index.vue

@@ -74,14 +74,17 @@
 				}
 			},
 			finish2(e) {
+				debugger
 				if (this.password != e) {
 					this.info = true;
 					return;
 				} else {
 					//这个判断是否首次建立钱包
-					if(uni.getStorageSync('walletInfo')){
+					var walletInfo=uni.getStorageSync('walletInfo');
+					if(walletInfo){
 						var a = uni.getStorageSync('createWalletName')
 							var mnemonic = uni.getStorageSync('word');
+							console.log(mnemonic,456446)
 							try {
 							  this.$walletUtil.mnemonicEstablishWallet(a,mnemonic,e)
 							 			uni.showToast({	 
@@ -96,6 +99,7 @@
 							 			}, 1500)
 							}
 							catch(err){
+								console.log(err)
 							   uni.showToast({
 							 	title:this.$t('index').Creationfailed,	
 							   	icon: 'none',

pages/menu/setting/index.vue

@@ -124,7 +124,7 @@
 						this.checked = false
 						this.hou_jia_w = false;
 						this.show = false;
-						uni.setStorageSync('fingerPass', false)
+						uni.removeStorageSync('fingerPass', false)
 					},
 					// 关闭所有
 					cancel() {

utils/TokenUtil.js

@@ -37,9 +37,7 @@ let token = {
 	},
 	//获取Child
 	getPrivateKey: function(mnemonic, hdpath) {
-		if (mnemonic.split(" ").length % 12 > 0) {
+		
-			throw new Error("mnemonic error");
-		}
 		let seed = bip39.mnemonicToSeedSync(mnemonic);
 		const node = bip32.fromSeed(seed);
 		const child = node.derivePath(hdpath);