diff --git a/App.vue b/App.vue index 2513d60..6341065 100644 --- a/App.vue +++ b/App.vue @@ -22,9 +22,21 @@ this.getIp(); console.log('App Launch') // #endif - + // 指纹 + // if(uni.getStorageSync('fingerPass')){ + // uni.reLaunch({ + // url:'/pages/fingerPage/index' + // }) + // }else{ + // uni.reLaunch({ + // url:'/pages/register/index' + // }) + // } }, + + + onShow: function() { console.log('App Show') diff --git a/components/navigation/navigation.vue b/components/navigation/navigation.vue index 6752ae2..c95e352 100644 --- a/components/navigation/navigation.vue +++ b/components/navigation/navigation.vue @@ -78,6 +78,7 @@ position: sticky; top: 40px; width: 100%; + z-index: 9999; } .back{ diff --git a/pages.json b/pages.json index 0182475..5bde512 100644 --- a/pages.json +++ b/pages.json @@ -10,6 +10,18 @@ } }, + { + "path": "pages/fingerPage/index", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/menu/helpCenter/index", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/menu/index/index", "style": { diff --git a/pages/fingerPage/index.css b/pages/fingerPage/index.css new file mode 100644 index 0000000..9eab506 --- /dev/null +++ b/pages/fingerPage/index.css @@ -0,0 +1,75 @@ +page{ + overflow-y: hidden; +} + +.logo{ + display: block; + margin: 0 auto; + width: 80rpx; + height: 80rpx; + margin-top: 180rpx; +} +.fingcon{ +margin-top: 300rpx; + +} +.fingcon .finimg{ + width: 100rpx; + display: block; + margin: 0 auto; + height: 100px; +} +.te1{ + margin-top: 20rpx; + text-align: center; +} +.passTex{ + position: absolute; + bottom: 56rpx; + left: 50%; + transform: translateX(-50%); + color: #746DFF; +} + + +/* 指纹后加 */ + .hou_jia{ + width: 95%; + height: 300rpx; + border-radius: 20rpx; + position: relative; + left: 50%; + top: 40%; + transform: translate(-50%,-60%); + background-color: #414141; + padding: 48rpx; + z-index: 9999; + } + .rela{ + + } + .zzw{ + display: block; + width: 88rpx; + height: 88rpx; + margin: 20rpx auto; + } + .Log{ + text-align: center; + color: #fff; + } + .hou_jia_w{ + background-color: #fff !important; + } + .fontt{ + font-size: 32rpx; + } + .ccon{ + display: flex; + position: absolute; + right: 50rpx; + bottom: 50rpx; + } + .cancle{ + margin-right: 50rpx; + } \ No newline at end of file diff --git a/pages/fingerPage/index.vue b/pages/fingerPage/index.vue new file mode 100644 index 0000000..1a449f8 --- /dev/null +++ b/pages/fingerPage/index.vue @@ -0,0 +1,223 @@ + + + + + + diff --git a/pages/menu/helpCenter/index.css b/pages/menu/helpCenter/index.css new file mode 100644 index 0000000..26a820c --- /dev/null +++ b/pages/menu/helpCenter/index.css @@ -0,0 +1,37 @@ +.main{ + margin-top: 40rpx; + padding: 0 32rpx; +} +/deep/ .u-collapse-head{ + height: 466rpx; + background-color: #F8F8FF; +} +.item{ + width: 100%; + padding: 0 32rpx; + padding-top: 64rpx; + padding-bottom: 64rpx; + background-color: #F8F8FF; + border-bottom: 2rpx solid #EFF1F2; + position: relative; +} +.item:last-child{ + border-bottom: none; +} +.item .num{ + font-size: 64rpx; + font-weight: bold; + color: #9D96A8; +} +.btx{ + font-size: 40rpx; + font-weight: 700; + margin-top: 44rpx; +} +.teximg{ + width: 64rpx; + height: 64rpx; + position: absolute; + right: 32rpx; + top: 160rpx; +} \ No newline at end of file diff --git a/pages/menu/helpCenter/index.vue b/pages/menu/helpCenter/index.vue new file mode 100644 index 0000000..bad4437 --- /dev/null +++ b/pages/menu/helpCenter/index.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/pages/menu/profile/index.vue b/pages/menu/profile/index.vue index 31f835e..ed53f9b 100644 --- a/pages/menu/profile/index.vue +++ b/pages/menu/profile/index.vue @@ -102,17 +102,20 @@ }) }, goHelp() { - uni.showToast({ - title:this.$t('index').Notyetopen, - icon: 'none', - duration: 1500 - }) + uni.navigateTo({ + url: '/pages/menu/helpCenter/index' + }) }, goSettings() { uni.navigateTo({ url: '/pages/menu/setting/index' }) }, + gotest(){ + uni.navigateTo({ + url: '/pages/fingerPage/index' + }) + }, goMan() { uni.navigateTo({ url: '/pages/menu/wallet/mwallet/index' diff --git a/pages/register/index.css b/pages/register/index.css index 0e1b6c0..ba53f32 100644 --- a/pages/register/index.css +++ b/pages/register/index.css @@ -1,6 +1,8 @@ .lans{ - + padding: 0 10rpx; + margin-top: 20rpx; + color: #2F80ED; } @@ -100,7 +102,7 @@ } .select{ margin-top: 30rpx; - padding-bottom: 50rpx; + padding-bottom: 20rpx; display: flex; justify-content: center; } diff --git a/pages/register/index.vue b/pages/register/index.vue index 933233e..a03eccf 100644 --- a/pages/register/index.vue +++ b/pages/register/index.vue @@ -1,9 +1,5 @@