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 index 8825213..0419a19 100644 --- a/components/LockDateHourPicker/LockDateHourPicker.vue +++ b/components/LockDateHourPicker/LockDateHourPicker.vue @@ -190,15 +190,6 @@ selectedHour = Math.max(selectedHour, minDateParsed.value.hour) } - console.log(1111, selectedYear, selectedMonth, selectedDay, selectedHour) - console.log( - 1111, - yearIndex, - updatedMonths.indexOf(selectedMonth), - updatedDays.indexOf(selectedDay), - updatedHours.indexOf(selectedHour) - ) - tempPickerValue.value = { year: selectedYear, month: selectedMonth, 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/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)