liyi/wx-starlock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修正邮箱确认验证码最大长度错误，添加锁前添加引导页面

Browse Source
This commit is contained in:
范鹏 2024-10-10 17:12:14 +08:00
parent f53c4fad8d
commit 00e1f78920
8 changed files with 267 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifest.json
View File

@ -3,7 +3,7 @@
"appid" : "__UNI__933D519",
"description" : "",
"versionName" : "1.1.0",
"versionCode" : "25",
"versionCode" : "26",
"transformPx" : false,
/* 小程序特有相关 */
"mp-weixin" : {

349
pages.json
View File

@ -1,173 +1,180 @@
{
"easycom": {
"autoscan": true,
"custom": {
"^u--(.*)": "uview-plus/components/u-$1/u-$1.vue",
"^up-(.*)": "uview-plus/components/u-$1/u-$1.vue",
"^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue"
}
},
"pages": [
{
"path": "pages/home/home"
},
{
"path": "pages/selectAddress/selectAddress",
"style": {
"navigationBarTitleText": "锁地址",
"disableScroll": true
}
},
{
"path": "pages/mine/mine"
},
{
"path": "pages/userInfo/userInfo",
"style": {
"navigationBarTitleText": "个人信息"
}
},
{
"path": "pages/updateName/updateName",
"style": {
"navigationBarTitleText": "修改昵称"
}
},
{
"path": "pages/updatePassword/updatePassword",
"style": {
"navigationBarTitleText": "重置密码"
}
},
{
"path": "pages/updateEmail/updateEmail",
"style": {
"navigationBarTitleText": "修改邮箱"
}
},
{
"path": "pages/verifyEmail/verifyEmail",
"style": {
"navigationBarTitleText": "验证邮箱"
}
},
{
"path": "pages/webview/webview",
"style": {
"navigationBarTitleText": "介绍"
}
},
{
"path": "pages/lockDetail/lockDetail",
"style": {
"navigationBarTitleText": "星星锁"
}
},
{
"path": "pages/bindLock/bindLock",
"style": {
"navigationBarTitleText": "添加锁"
}
},
{
"path": "pages/searchDevice/searchDevice",
"style": {
"disableScroll": true,
"navigationBarTitleText": "附近设备"
}
},
{
"path": "pages/setting/setting",
"style": {
"navigationBarTitleText": "设置"
}
},
{
"path": "pages/keyList/keyList",
"style": {
"disableScroll": true,
"navigationBarTitleText": "电子钥匙"
}
},
{
"path": "pages/createKey/createKey",
"style": {
"navigationBarTitleText": "发送钥匙"
}
},
{
"path": "pages/passwordList/passwordList",
"style": {
"disableScroll": true,
"navigationBarTitleText": "密码"
}
},
{
"path": "pages/createPassword/createPassword",
"style": {
"disableScroll": true,
"navigationBarTitleText": "获取密码"
}
},
{
"path": "pages/passwordDetail/passwordDetail",
"style": {
"disableScroll": true,
"navigationBarTitleText": "密码详情"
}
},
{
"path": "pages/keyDetail/keyDetail",
"style": {
"disableScroll": true,
"navigationBarTitleText": "钥匙详情"
}
},
{
"path": "pages/notificationList/notificationList",
"style": {
"navigationBarTitleText": "通知列表"
}
},
{
"path": "pages/notificationDetail/notificationDetail",
"style": {
"navigationBarTitleText": "消息详情"
}
}
],
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "星星锁",
"navigationBarBackgroundColor": "#63b8af",
"backgroundColor": "#F3F3F3",
"navigationStyle": "default"
},
"tabBar": {
"color": "#a3a3a3",
"selectedColor": "#63b8af",
"borderStyle": "white",
"backgroundColor": "#FFFFFF",
"position": "bottom",
"list": [
{
"pagePath": "pages/home/home",
"iconPath": "static/images/tabbar_key_no_select.png",
"selectedIconPath": "static/images/tabbar_key_select.png",
"text": "设备"
},
{
"pagePath": "pages/notificationList/notificationList",
"iconPath": "static/images/tabbar_notification_no_select.png",
"selectedIconPath": "static/images/tabbar_notification_select.png",
"text": "消息"
},
{
"pagePath": "pages/mine/mine",
"iconPath": "static/images/tabbar_mine_no_select.png",
"selectedIconPath": "static/images/tabbar_mine_select.png",
"text": "我的"
}
]
}
"easycom": {
"autoscan": true,
"custom": {
"^u--(.*)": "uview-plus/components/u-$1/u-$1.vue",
"^up-(.*)": "uview-plus/components/u-$1/u-$1.vue",
"^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue"
}
},
"pages": [
{
"path": "pages/home/home"
},
{
"path": "pages/selectAddress/selectAddress",
"style": {
"navigationBarTitleText": "锁地址",
"disableScroll": true
}
},
{
"path": "pages/mine/mine"
},
{
"path": "pages/userInfo/userInfo",
"style": {
"navigationBarTitleText": "个人信息"
}
},
{
"path": "pages/updateName/updateName",
"style": {
"navigationBarTitleText": "修改昵称"
}
},
{
"path": "pages/updatePassword/updatePassword",
"style": {
"navigationBarTitleText": "重置密码"
}
},
{
"path": "pages/updateEmail/updateEmail",
"style": {
"navigationBarTitleText": "修改邮箱"
}
},
{
"path": "pages/verifyEmail/verifyEmail",
"style": {
"navigationBarTitleText": "验证邮箱"
}
},
{
"path": "pages/webview/webview",
"style": {
"navigationBarTitleText": "介绍"
}
},
{
"path": "pages/lockDetail/lockDetail",
"style": {
"navigationBarTitleText": "星星锁"
}
},
{
"path": "pages/bindLock/bindLock",
"style": {
"navigationBarTitleText": "添加锁"
}
},
{
"path": "pages/searchDevice/searchDevice",
"style": {
"disableScroll": true,
"navigationBarTitleText": "附近设备"
}
},
{
"path": "pages/setting/setting",
"style": {
"navigationBarTitleText": "设置"
}
},
{
"path": "pages/keyList/keyList",
"style": {
"disableScroll": true,
"navigationBarTitleText": "电子钥匙"
}
},
{
"path": "pages/createKey/createKey",
"style": {
"navigationBarTitleText": "发送钥匙"
}
},
{
"path": "pages/passwordList/passwordList",
"style": {
"disableScroll": true,
"navigationBarTitleText": "密码"
}
},
{
"path": "pages/createPassword/createPassword",
"style": {
"disableScroll": true,
"navigationBarTitleText": "获取密码"
}
},
{
"path": "pages/passwordDetail/passwordDetail",
"style": {
"disableScroll": true,
"navigationBarTitleText": "密码详情"
}
},
{
"path": "pages/keyDetail/keyDetail",
"style": {
"disableScroll": true,
"navigationBarTitleText": "钥匙详情"
}
},
{
"path": "pages/notificationList/notificationList",
"style": {
"navigationBarTitleText": "通知列表"
}
},
{
"path": "pages/notificationDetail/notificationDetail",
"style": {
"navigationBarTitleText": "消息详情"
}
},
{
"path": "pages/addLockGuid/addLockGuid",
"style": {
"navigationBarTitleText": "添加锁",
"disableScroll": true
}
}
],
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "星星锁",
"navigationBarBackgroundColor": "#63b8af",
"backgroundColor": "#F3F3F3",
"navigationStyle": "default"
},
"tabBar": {
"color": "#a3a3a3",
"selectedColor": "#63b8af",
"borderStyle": "white",
"backgroundColor": "#FFFFFF",
"position": "bottom",
"list": [
{
"pagePath": "pages/home/home",
"iconPath": "static/images/tabbar_key_no_select.png",
"selectedIconPath": "static/images/tabbar_key_select.png",
"text": "设备"
},
{
"pagePath": "pages/notificationList/notificationList",
"iconPath": "static/images/tabbar_notification_no_select.png",
"selectedIconPath": "static/images/tabbar_notification_select.png",
"text": "消息"
},
{
"pagePath": "pages/mine/mine",
"iconPath": "static/images/tabbar_mine_no_select.png",
"selectedIconPath": "static/images/tabbar_mine_select.png",
"text": "我的"
}
]
}
}

79
pages/addLockGuid/addLockGuid.vue Normal file
View File

@ -0,0 +1,79 @@
<template>
<view>
<view class="title">摸亮触摸屏</view>
<image src="/static/images/icon_lock_touch_screen.png" mode="aspectFill" class="icon"></image>
<view class="tips">摸亮触摸屏，锁进入可添加状态，点击下一步</view>
<view @click="toSearchDevice" class="button">下一步</view>
</view>
</template>
<script>
import { mapActions, mapState } from 'pinia'
import { useBluetoothStore } from '@/stores/bluetooth'
import { useBasicStore } from '@/stores/basic'
export default {
data () {
return {}
},
computed: {
...mapState(useBluetoothStore, ['bluetoothStatus', 'isInitBluetooth']),
},
methods: {
...mapActions(useBluetoothStore, ['getBluetoothStatus', 'initAndListenBluetooth', 'checkSetting']),
...mapActions(useBasicStore, ['routeJump']),
async toSearchDevice() {
if(this.bluetoothStatus !== 0) {
this.getBluetoothStatus()
return
}
let result = true
if(!this.isInitBluetooth) {
result = await this.initAndListenBluetooth()
}
if(result) {
this.routeJump({
name: 'searchDevice'
})
} else {
this.checkSetting()
}
},
},
}
</script>
<style lang="scss" scoped>
.title {
text-align: center;
margin-top: 200rpx;
font-size: 36rpx;
font-weight: bold;
}
.icon {
width: 300rpx;
height: 300rpx;
margin: 150rpx 225rpx;
}
.tips {
text-align: center;
font-size: 28rpx;
color: #999;
margin-bottom: 100rpx;
font-weight: bold;
}
.button {
width: 600rpx;
height: 100rpx;
line-height: 100rpx;
text-align: center;
background-color: #63b8af;
color: #fff;
border-radius: 50rpx;
margin: 0 auto;
font-size: 36rpx;
}
</style>

18
pages/home/home.vue
View File

@ -405,21 +405,9 @@
this.focus = false
},
async toSearchDevice() {
if(this.bluetoothStatus !== 0) {
this.getBluetoothStatus()
return
}
let result = true
if(!this.isInitBluetooth) {
result = await this.initAndListenBluetooth()
}
if(result) {
this.routeJump({
name: 'searchDevice'
})
} else {
this.checkSetting()
}
this.routeJump({
name: 'addLockGuid'
})
},
async toLockDeatil(lock) {
if(!(this.bluetoothStatus === 0 || this.bluetoothStatus === -1)) {

2
pages/verifyEmail/verifyEmail.vue
View File

@ -2,7 +2,7 @@
<view>
<view class="tips">为了你的账号安全，修改账号前请先使用验证码验证</view>
<view class="view-top">
<input type="number" class="input" :value="verificationCode" maxlength="20" placeholder="请输入验证码"
<input type="number" class="input" :value="verificationCode" maxlength="6" placeholder="请输入验证码"
placeholder-class="input-placeholder" @input="updateInput"></input>
<view class="button-verify" @click="getEmailCode">{{text}}</view>
</view>

BIN
static/images/icon_lock_touch_screen.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
static/images/img.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

5
stores/basic.js
View File

@ -106,6 +106,11 @@ const pages = [
name: 'notificationDetail',
path: '/pages/notificationDetail/notificationDetail',
tabBar: false
},
{
name: 'addLockGuid',
path: '/pages/addLockGuid/addLockGuid',
tabBar: false
}
]