密码

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

@@ -262,11 +262,32 @@
 		},
 		onLoad() {
 			// 每次进来拿缓存里有没有指纹
+			let fingerPass=uni.getStorageSync('fingerPass');
+			console.log(fingerPass,"fingerPass")
 			if (uni.getStorageSync('fingerPass')) {
 				this.showFinger = 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)"  
- :focus="foucStatus"  @blur="hideMon" />
+			<u-input type="textarea" :clearable="false" v-model="wordInfo" @input="getmon()" :placeholder="teee"
+				class="textareaa" placeholderStyle="color:rgb(224,229,242)" :focus="foucStatus" @blur="hideMon" />
 
 			<u-button class="custom-style" @click="confirm">{{i18n.Confirm}}</u-button>
 
@@ -170,15 +170,6 @@
 				}
 				this.typename = uni.getStorageSync('createWalletName')
 				if (!this.typename) {
-				
-					if(this.wordInfo.split(" ").length%12!=0){
-						uni.showToast({
-							title: this.$t('index').MnemonicsError,
-							icon: 'none',
-							duration: 1500
-						})
-						return;
-					}
 					uni.setStorageSync('word', this.wordInfo);
 					uni.navigateTo({
 						url: '/pages/menu/backUp/transPaw/index'
@@ -230,7 +221,7 @@ this.defaultPhoneHeight = window.innerHeight
 			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);