fix: 修正邮箱确认验证码最大长度错误，添加锁前添加引导页面
This commit is contained in:
范鹏
parent
f53c4fad8d
commit
00e1f78920
@ -3,7 +3,7 @@
|
|||||||
"appid" : "__UNI__933D519",
|
"appid" : "__UNI__933D519",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.1.0",
|
"versionName" : "1.1.0",
|
||||||
"versionCode" : "25",
|
"versionCode" : "26",
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
/* 小程序特有相关 */
|
/* 小程序特有相关 */
|
||||||
"mp-weixin" : {
|
"mp-weixin" : {
|
||||||
|
|||||||
349
pages.json
349
pages.json
@ -1,173 +1,180 @@
|
|||||||
{
|
{
|
||||||
"easycom": {
|
"easycom": {
|
||||||
"autoscan": true,
|
"autoscan": true,
|
||||||
"custom": {
|
"custom": {
|
||||||
"^u--(.*)": "uview-plus/components/u-$1/u-$1.vue",
|
"^u--(.*)": "uview-plus/components/u-$1/u-$1.vue",
|
||||||
"^up-(.*)": "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"
|
"^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"pages": [
|
"pages": [
|
||||||
{
|
{
|
||||||
"path": "pages/home/home"
|
"path": "pages/home/home"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/selectAddress/selectAddress",
|
"path": "pages/selectAddress/selectAddress",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "锁地址",
|
"navigationBarTitleText": "锁地址",
|
||||||
"disableScroll": true
|
"disableScroll": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/mine/mine"
|
"path": "pages/mine/mine"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/userInfo/userInfo",
|
"path": "pages/userInfo/userInfo",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "个人信息"
|
"navigationBarTitleText": "个人信息"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/updateName/updateName",
|
"path": "pages/updateName/updateName",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "修改昵称"
|
"navigationBarTitleText": "修改昵称"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/updatePassword/updatePassword",
|
"path": "pages/updatePassword/updatePassword",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "重置密码"
|
"navigationBarTitleText": "重置密码"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/updateEmail/updateEmail",
|
"path": "pages/updateEmail/updateEmail",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "修改邮箱"
|
"navigationBarTitleText": "修改邮箱"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/verifyEmail/verifyEmail",
|
"path": "pages/verifyEmail/verifyEmail",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "验证邮箱"
|
"navigationBarTitleText": "验证邮箱"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/webview/webview",
|
"path": "pages/webview/webview",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "介绍"
|
"navigationBarTitleText": "介绍"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/lockDetail/lockDetail",
|
"path": "pages/lockDetail/lockDetail",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "星星锁"
|
"navigationBarTitleText": "星星锁"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/bindLock/bindLock",
|
"path": "pages/bindLock/bindLock",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "添加锁"
|
"navigationBarTitleText": "添加锁"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/searchDevice/searchDevice",
|
"path": "pages/searchDevice/searchDevice",
|
||||||
"style": {
|
"style": {
|
||||||
"disableScroll": true,
|
"disableScroll": true,
|
||||||
"navigationBarTitleText": "附近设备"
|
"navigationBarTitleText": "附近设备"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/setting/setting",
|
"path": "pages/setting/setting",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "设置"
|
"navigationBarTitleText": "设置"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/keyList/keyList",
|
"path": "pages/keyList/keyList",
|
||||||
"style": {
|
"style": {
|
||||||
"disableScroll": true,
|
"disableScroll": true,
|
||||||
"navigationBarTitleText": "电子钥匙"
|
"navigationBarTitleText": "电子钥匙"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/createKey/createKey",
|
"path": "pages/createKey/createKey",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "发送钥匙"
|
"navigationBarTitleText": "发送钥匙"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/passwordList/passwordList",
|
"path": "pages/passwordList/passwordList",
|
||||||
"style": {
|
"style": {
|
||||||
"disableScroll": true,
|
"disableScroll": true,
|
||||||
"navigationBarTitleText": "密码"
|
"navigationBarTitleText": "密码"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/createPassword/createPassword",
|
"path": "pages/createPassword/createPassword",
|
||||||
"style": {
|
"style": {
|
||||||
"disableScroll": true,
|
"disableScroll": true,
|
||||||
"navigationBarTitleText": "获取密码"
|
"navigationBarTitleText": "获取密码"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/passwordDetail/passwordDetail",
|
"path": "pages/passwordDetail/passwordDetail",
|
||||||
"style": {
|
"style": {
|
||||||
"disableScroll": true,
|
"disableScroll": true,
|
||||||
"navigationBarTitleText": "密码详情"
|
"navigationBarTitleText": "密码详情"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/keyDetail/keyDetail",
|
"path": "pages/keyDetail/keyDetail",
|
||||||
"style": {
|
"style": {
|
||||||
"disableScroll": true,
|
"disableScroll": true,
|
||||||
"navigationBarTitleText": "钥匙详情"
|
"navigationBarTitleText": "钥匙详情"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/notificationList/notificationList",
|
"path": "pages/notificationList/notificationList",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "通知列表"
|
"navigationBarTitleText": "通知列表"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/notificationDetail/notificationDetail",
|
"path": "pages/notificationDetail/notificationDetail",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "消息详情"
|
"navigationBarTitleText": "消息详情"
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
],
|
{
|
||||||
"globalStyle": {
|
"path": "pages/addLockGuid/addLockGuid",
|
||||||
"navigationBarTextStyle": "white",
|
"style": {
|
||||||
"navigationBarTitleText": "星星锁",
|
"navigationBarTitleText": "添加锁",
|
||||||
"navigationBarBackgroundColor": "#63b8af",
|
"disableScroll": true
|
||||||
"backgroundColor": "#F3F3F3",
|
}
|
||||||
"navigationStyle": "default"
|
}
|
||||||
},
|
],
|
||||||
"tabBar": {
|
"globalStyle": {
|
||||||
"color": "#a3a3a3",
|
"navigationBarTextStyle": "white",
|
||||||
"selectedColor": "#63b8af",
|
"navigationBarTitleText": "星星锁",
|
||||||
"borderStyle": "white",
|
"navigationBarBackgroundColor": "#63b8af",
|
||||||
"backgroundColor": "#FFFFFF",
|
"backgroundColor": "#F3F3F3",
|
||||||
"position": "bottom",
|
"navigationStyle": "default"
|
||||||
"list": [
|
},
|
||||||
{
|
"tabBar": {
|
||||||
"pagePath": "pages/home/home",
|
"color": "#a3a3a3",
|
||||||
"iconPath": "static/images/tabbar_key_no_select.png",
|
"selectedColor": "#63b8af",
|
||||||
"selectedIconPath": "static/images/tabbar_key_select.png",
|
"borderStyle": "white",
|
||||||
"text": "设备"
|
"backgroundColor": "#FFFFFF",
|
||||||
},
|
"position": "bottom",
|
||||||
{
|
"list": [
|
||||||
"pagePath": "pages/notificationList/notificationList",
|
{
|
||||||
"iconPath": "static/images/tabbar_notification_no_select.png",
|
"pagePath": "pages/home/home",
|
||||||
"selectedIconPath": "static/images/tabbar_notification_select.png",
|
"iconPath": "static/images/tabbar_key_no_select.png",
|
||||||
"text": "消息"
|
"selectedIconPath": "static/images/tabbar_key_select.png",
|
||||||
},
|
"text": "设备"
|
||||||
{
|
},
|
||||||
"pagePath": "pages/mine/mine",
|
{
|
||||||
"iconPath": "static/images/tabbar_mine_no_select.png",
|
"pagePath": "pages/notificationList/notificationList",
|
||||||
"selectedIconPath": "static/images/tabbar_mine_select.png",
|
"iconPath": "static/images/tabbar_notification_no_select.png",
|
||||||
"text": "我的"
|
"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
79
pages/addLockGuid/addLockGuid.vue
Normal 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>
|
||||||
@ -405,21 +405,9 @@
|
|||||||
this.focus = false
|
this.focus = false
|
||||||
},
|
},
|
||||||
async toSearchDevice() {
|
async toSearchDevice() {
|
||||||
if(this.bluetoothStatus !== 0) {
|
this.routeJump({
|
||||||
this.getBluetoothStatus()
|
name: 'addLockGuid'
|
||||||
return
|
})
|
||||||
}
|
|
||||||
let result = true
|
|
||||||
if(!this.isInitBluetooth) {
|
|
||||||
result = await this.initAndListenBluetooth()
|
|
||||||
}
|
|
||||||
if(result) {
|
|
||||||
this.routeJump({
|
|
||||||
name: 'searchDevice'
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
this.checkSetting()
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
async toLockDeatil(lock) {
|
async toLockDeatil(lock) {
|
||||||
if(!(this.bluetoothStatus === 0 || this.bluetoothStatus === -1)) {
|
if(!(this.bluetoothStatus === 0 || this.bluetoothStatus === -1)) {
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
<view>
|
<view>
|
||||||
<view class="tips">为了你的账号安全，修改账号前请先使用验证码验证</view>
|
<view class="tips">为了你的账号安全，修改账号前请先使用验证码验证</view>
|
||||||
<view class="view-top">
|
<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>
|
placeholder-class="input-placeholder" @input="updateInput"></input>
|
||||||
<view class="button-verify" @click="getEmailCode">{{text}}</view>
|
<view class="button-verify" @click="getEmailCode">{{text}}</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
BIN
static/images/icon_lock_touch_screen.png
Executable file
BIN
static/images/icon_lock_touch_screen.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB |
@ -106,6 +106,11 @@ const pages = [
|
|||||||
name: 'notificationDetail',
|
name: 'notificationDetail',
|
||||||
path: '/pages/notificationDetail/notificationDetail',
|
path: '/pages/notificationDetail/notificationDetail',
|
||||||
tabBar: false
|
tabBar: false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'addLockGuid',
|
||||||
|
path: '/pages/addLockGuid/addLockGuid',
|
||||||
|
tabBar: false
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user