diff --git a/manifest.json b/manifest.json
index 2cd1474..8395c69 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
"appid" : "__UNI__933D519",
"description" : "",
"versionName" : "1.1.0",
- "versionCode" : "25",
+ "versionCode" : "26",
"transformPx" : false,
/* 小程序特有相关 */
"mp-weixin" : {
diff --git a/pages.json b/pages.json
index c1ad0ed..342e554 100644
--- a/pages.json
+++ b/pages.json
@@ -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": "我的"
+ }
+ ]
+ }
}
diff --git a/pages/addLockGuid/addLockGuid.vue b/pages/addLockGuid/addLockGuid.vue
new file mode 100644
index 0000000..2a3788b
--- /dev/null
+++ b/pages/addLockGuid/addLockGuid.vue
@@ -0,0 +1,79 @@
+
+
+ 摸亮触摸屏
+
+ 摸亮触摸屏,锁进入可添加状态,点击下一步
+ 下一步
+
+
+
+
+
+
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 3a00ecc..039aebc 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -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)) {
diff --git a/pages/verifyEmail/verifyEmail.vue b/pages/verifyEmail/verifyEmail.vue
index 1e5519e..3e530f3 100644
--- a/pages/verifyEmail/verifyEmail.vue
+++ b/pages/verifyEmail/verifyEmail.vue
@@ -2,7 +2,7 @@
为了你的账号安全,修改账号前请先使用验证码验证
-
{{text}}
diff --git a/static/images/icon_lock_touch_screen.png b/static/images/icon_lock_touch_screen.png
new file mode 100755
index 0000000..de3f363
Binary files /dev/null and b/static/images/icon_lock_touch_screen.png differ
diff --git a/static/images/img.png b/static/images/img.png
deleted file mode 100644
index e6d877c..0000000
Binary files a/static/images/img.png and /dev/null differ
diff --git a/stores/basic.js b/stores/basic.js
index bbc4e8c..127e622 100644
--- a/stores/basic.js
+++ b/stores/basic.js
@@ -106,6 +106,11 @@ const pages = [
name: 'notificationDetail',
path: '/pages/notificationDetail/notificationDetail',
tabBar: false
+ },
+ {
+ name: 'addLockGuid',
+ path: '/pages/addLockGuid/addLockGuid',
+ tabBar: false
}
]