diff --git a/api/fingerprint.js b/api/fingerprint.js index 3eeff52..eafe01e 100644 --- a/api/fingerprint.js +++ b/api/fingerprint.js @@ -55,3 +55,12 @@ export function getFingerprintRequest(data) { data }) } + +// 获取胁迫指纹列表 +export function getCoercedListRequest(data) { + return request({ + url: '/fingerprint/getCoercedList', + method: 'POST', + data + }) +} diff --git a/api/lock.js b/api/lock.js index cc58004..9a15f3e 100644 --- a/api/lock.js +++ b/api/lock.js @@ -37,3 +37,12 @@ export function deleteLockRequest(data) { data }) } + +// 锁用户列表 +export function lockUserListRequest(data) { + return request({ + url: '/lock/lockKeysList', + method: 'POST', + data + }) +} diff --git a/api/setting.js b/api/setting.js index f8c8a62..d172262 100644 --- a/api/setting.js +++ b/api/setting.js @@ -73,3 +73,57 @@ export function lockDataUploadRequest(data) { data }) } + +// 获取锁通知设置 +export function getLockNoticeSettingRequest(data) { + return request({ + url: '/lockSetting/getLockNoticeSetting', + method: 'POST', + data + }) +} + +// 更新锁通知设置 +export function updateLockNoticeSettingRequest(data) { + return request({ + url: '/lockSetting/updateLockNoticeSetting', + method: 'POST', + data + }) +} + +// 获取通知列表 +export function getNoticeListRequest(data) { + return request({ + url: '/lockNoticeSettingAccount/list', + method: 'POST', + data + }) +} + +// 更新通知 +export function updateNoticeRequest(data) { + return request({ + url: '/lockNoticeSettingAccount/update', + method: 'POST', + data + }) +} + +// 删除通知 +export function deleteNoticeRequest(data) { + return request({ + url: '/lockNoticeSettingAccount/delete', + method: 'POST', + data + }) +} + +// 添加通知 +export function addNoticeRequest(data) { + return request({ + url: '/lockNoticeSettingAccount/add', + method: 'POST', + data + }) +} diff --git a/api/user.js b/api/user.js index eef6c04..2ea0a3e 100644 --- a/api/user.js +++ b/api/user.js @@ -101,3 +101,11 @@ export function updateTimezoneOffsetRequest(data) { }) } +// 获取url +export function getWebUrlRequest(data) { + return request({ + url: '/v2/service/getPackageUrl', + method: 'POST', + data + }) +} diff --git a/constant/keyType.js b/constant/keyType.js new file mode 100644 index 0000000..b72e204 --- /dev/null +++ b/constant/keyType.js @@ -0,0 +1,30 @@ +export const keysType = { + 1: { + name: '电子钥匙', + icon: '/static/images/icon_user.png' + }, + 2: { + name: '密码', + icon: '/static/images/icon_password.png' + }, + 3: { + name: '指纹', + icon: '/static/images/icon_fingerprint_white.png' + }, + 4: { + name: '卡', + icon: '/static/images/icon_card_white.png' + }, + 5: { + name: '人脸', + icon: '/static/images/icon_face_white.png' + }, + 6: { + name: '掌静脉', + icon: '/static/images/icon_palm_vein_white.png' + }, + 7: { + name: '遥控', + icon: '/static/images/icon_remote_white.png' + } +} diff --git a/pages.json b/pages.json index e546666..f689b07 100644 --- a/pages.json +++ b/pages.json @@ -414,6 +414,76 @@ "navigationBarTitleText": "电机功率设置", "disableScroll": true } + }, + { + "path": "pages/catEye/catEye", + "style": { + "navigationBarTitleText": "猫眼设置", + "disableScroll": true + } + }, + { + "path": "pages/messageReminder/messageReminder", + "style": { + "navigationBarTitleText": "消息提醒", + "disableScroll": true + } + }, + { + "path": "pages/openDoorNotice/openDoorNotice", + "style": { + "navigationBarTitleText": "家人到家", + "disableScroll": true + } + }, + { + "path": "pages/noticeDetail/noticeDetail", + "style": { + "navigationBarTitleText": "家人详情", + "disableScroll": true + } + }, + { + "path": "pages/lockUser/lockUser", + "style": { + "navigationBarTitleText": "锁用户", + "disableScroll": true + } + }, + { + "path": "pages/noticeWay/noticeWay", + "style": { + "navigationBarTitleText": "提醒方式", + "disableScroll": true + } + }, + { + "path": "pages/notOpenDoor/notOpenDoor", + "style": { + "navigationBarTitleText": "N天未开门", + "disableScroll": true + } + }, + { + "path": "pages/lowElecNotice/lowElecNotice", + "style": { + "navigationBarTitleText": "低电量提醒", + "disableScroll": true + } + }, + { + "path": "pages/coercionOpenDoor/coercionOpenDoor", + "style": { + "navigationBarTitleText": "胁迫开门", + "disableScroll": true + } + }, + { + "path": "pages/coercionFingerprint/coercionFingerprint", + "style": { + "navigationBarTitleText": "指纹列表", + "disableScroll": true + } } ], "globalStyle": { diff --git a/pages/catEye/catEye.vue b/pages/catEye/catEye.vue new file mode 100644 index 0000000..16c4023 --- /dev/null +++ b/pages/catEye/catEye.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/pages/coercionFingerprint/coercionFingerprint.vue b/pages/coercionFingerprint/coercionFingerprint.vue new file mode 100644 index 0000000..10e5176 --- /dev/null +++ b/pages/coercionFingerprint/coercionFingerprint.vue @@ -0,0 +1,329 @@ + + + + + + + diff --git a/pages/coercionOpenDoor/coercionOpenDoor.vue b/pages/coercionOpenDoor/coercionOpenDoor.vue new file mode 100644 index 0000000..3eb76a6 --- /dev/null +++ b/pages/coercionOpenDoor/coercionOpenDoor.vue @@ -0,0 +1,159 @@ + + + + + diff --git a/pages/createPassword/createPassword.vue b/pages/createPassword/createPassword.vue index 77be4d1..d6cf61b 100644 --- a/pages/createPassword/createPassword.vue +++ b/pages/createPassword/createPassword.vue @@ -441,7 +441,6 @@ } const { code, data } = await $bluetooth.setLockPassword(params) if (code === 0 && data.status === 0) { - console.log(1111, data) const { code: requestCode, message } = await addCustomPasswordRequest({ lockId: $bluetooth.currentLockInfo.lockId, isCoerced: 2, diff --git a/pages/lockUser/lockUser.vue b/pages/lockUser/lockUser.vue new file mode 100644 index 0000000..838a5ee --- /dev/null +++ b/pages/lockUser/lockUser.vue @@ -0,0 +1,392 @@ + + + + + + + diff --git a/pages/lowElecNotice/lowElecNotice.vue b/pages/lowElecNotice/lowElecNotice.vue new file mode 100644 index 0000000..890f25d --- /dev/null +++ b/pages/lowElecNotice/lowElecNotice.vue @@ -0,0 +1,135 @@ + + + + + diff --git a/pages/messageReminder/messageReminder.vue b/pages/messageReminder/messageReminder.vue new file mode 100644 index 0000000..0e06339 --- /dev/null +++ b/pages/messageReminder/messageReminder.vue @@ -0,0 +1,140 @@ + + + + + diff --git a/pages/notOpenDoor/notOpenDoor.vue b/pages/notOpenDoor/notOpenDoor.vue new file mode 100644 index 0000000..c0c9dee --- /dev/null +++ b/pages/notOpenDoor/notOpenDoor.vue @@ -0,0 +1,215 @@ + + + + + diff --git a/pages/noticeDetail/noticeDetail.vue b/pages/noticeDetail/noticeDetail.vue new file mode 100644 index 0000000..5482058 --- /dev/null +++ b/pages/noticeDetail/noticeDetail.vue @@ -0,0 +1,422 @@ + + + + + diff --git a/pages/noticeWay/noticeWay.vue b/pages/noticeWay/noticeWay.vue new file mode 100644 index 0000000..37ba193 --- /dev/null +++ b/pages/noticeWay/noticeWay.vue @@ -0,0 +1,191 @@ + + + + + + + diff --git a/pages/openDoorNotice/openDoorNotice.vue b/pages/openDoorNotice/openDoorNotice.vue new file mode 100644 index 0000000..52c6394 --- /dev/null +++ b/pages/openDoorNotice/openDoorNotice.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue index c07aa26..e6c65b4 100644 --- a/pages/setting/setting.vue +++ b/pages/setting/setting.vue @@ -112,10 +112,25 @@ 面容开锁 - - - - + + 消息提醒 + + + + 猫眼设置 + +