diff --git a/api/setting.js b/api/setting.js new file mode 100644 index 0000000..4a6dfda --- /dev/null +++ b/api/setting.js @@ -0,0 +1,12 @@ +import request from '../utils/request' + +// setting 设置模块 + +// 获取锁设置 +export function getLockSettingRequest(data) { + return request({ + url: '/lockSetting/getLockSetting', + method: 'POST', + data + }) +} diff --git a/components/LockCycle/LockCycle.vue b/components/LockCycle/LockCycle.vue new file mode 100644 index 0000000..823986a --- /dev/null +++ b/components/LockCycle/LockCycle.vue @@ -0,0 +1,69 @@ + + + diff --git a/components/LockDateHourPicker/LockDateHourPicker.vue b/components/LockDateHourPicker/LockDateHourPicker.vue new file mode 100644 index 0000000..0419a19 --- /dev/null +++ b/components/LockDateHourPicker/LockDateHourPicker.vue @@ -0,0 +1,267 @@ + + + diff --git a/pages.json b/pages.json index ff05c2b..aa45846 100644 --- a/pages.json +++ b/pages.json @@ -323,6 +323,13 @@ "navigationBarTitleText": "操作记录", "disableScroll": true } + }, + { + "path": "pages/cycleDate/cycleDate", + "style": { + "navigationBarTitleText": "有效期", + "disableScroll": true + } } ], "globalStyle": { diff --git a/pages/bindCard/bindCard.vue b/pages/bindCard/bindCard.vue index 9cf2331..05864f0 100644 --- a/pages/bindCard/bindCard.vue +++ b/pages/bindCard/bindCard.vue @@ -58,6 +58,7 @@ cardNumber: String(data.cardNumber), cardType: params.cardType, addType: 1, + weekDay: params.weekDays, cardRight: params.isAdmin, isCoerced: params.isForce === 1 ? 2 : 1 }) diff --git a/pages/bindFace/bindFace.vue b/pages/bindFace/bindFace.vue index a717da0..08d3322 100644 --- a/pages/bindFace/bindFace.vue +++ b/pages/bindFace/bindFace.vue @@ -58,6 +58,7 @@ faceUserNo: String(data.faceNumber), faceType: params.value.faceType, addType: 1, + weekDay: params.value.weekDays, fingerRight: params.value.isAdmin, isCoerced: params.value.isForce === 1 ? 2 : 1 }) diff --git a/pages/bindFingerprint/bindFingerprint.vue b/pages/bindFingerprint/bindFingerprint.vue index 5764617..317cc3a 100644 --- a/pages/bindFingerprint/bindFingerprint.vue +++ b/pages/bindFingerprint/bindFingerprint.vue @@ -57,6 +57,7 @@ lockId: $bluetooth.currentLockInfo.lockId, startDate: params.startDate, endDate: params.endDate, + weekDay: params.weekDays, fingerprintName: params.fingerprintName, fingerprintNumber: String(data.fingerprintNumber), fingerprintUserNo: String(data.fingerprintNumber), diff --git a/pages/bindPalmVein/bindPalmVein.vue b/pages/bindPalmVein/bindPalmVein.vue index 48680b4..e2da53e 100644 --- a/pages/bindPalmVein/bindPalmVein.vue +++ b/pages/bindPalmVein/bindPalmVein.vue @@ -55,6 +55,7 @@ palmVeinNumber: String(data.palmVeinNumber), palmVeinUserNo: String(data.palmVeinNumber), palmVeinType: params.palmVeinType, + weekDay: params.weekDays, addType: 1, palmVeinRight: params.isAdmin, isCoerced: params.isForce === 1 ? 2 : 1 diff --git a/pages/bindRemote/bindRemote.vue b/pages/bindRemote/bindRemote.vue index 087e2fc..c78e2c1 100644 --- a/pages/bindRemote/bindRemote.vue +++ b/pages/bindRemote/bindRemote.vue @@ -58,6 +58,7 @@ remoteNumber: String(data.remoteNumber), remoteType: params.remoteType, addType: 1, + weekDay: params.weekDays, remoteRight: params.isAdmin, isCoerced: params.isForce === 1 ? 2 : 1 }) diff --git a/pages/createCard/createCard.vue b/pages/createCard/createCard.vue index 97fc646..b1ad0cc 100644 --- a/pages/createCard/createCard.vue +++ b/pages/createCard/createCard.vue @@ -46,7 +46,7 @@ 下一步 - + @@ -69,7 +68,6 @@ :value="temporaryEndTime" :minDate="minDate" :maxDate="maxDate" - type="datehour" @change-time="changeDate('temporaryEndTime', $event)" > @@ -90,6 +88,33 @@ 下一步 + + + + + + + + + + + + 下一步 + @@ -97,6 +122,7 @@ + + diff --git a/stores/basic.js b/stores/basic.js index b5a94fc..c0b254d 100644 --- a/stores/basic.js +++ b/stores/basic.js @@ -241,6 +241,11 @@ const pages = [ name: 'typeRecordList', path: '/pages/typeRecordList/typeRecordList', tabBar: false + }, + { + name: 'cycleDate', + path: '/pages/cycleDate/cycleDate', + tabBar: false } ] diff --git a/stores/bluetooth.js b/stores/bluetooth.js index c223b7f..fb3b814 100644 --- a/stores/bluetooth.js +++ b/stores/bluetooth.js @@ -2337,7 +2337,7 @@ export const useBluetoothStore = defineStore('ble', { } } - const { + let { type, keyId, uid, @@ -2354,6 +2354,9 @@ export const useBluetoothStore = defineStore('ble', { endTime } = data + startDate = Math.floor(startDate / 1000) + endDate = Math.floor(endDate / 1000) + const length = 2 + 1 + 1 + 40 + 20 + 2 + 2 + 1 + 1 + 1 + 4 + 1 + 1 + 4 + 4 + 4 + 4 + 1 + 16 const headArray = this.createPackageHeader(3, length) const contentArray = new Uint8Array(length)