Merge branch 'fanpeng' into 'develop'

密码支持选择24点功能

See merge request StarlockTeam/wx-starlock!18

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
+  })
+}

components/LockCycle/LockCycle.vue

@@ -0,0 +1,69 @@
+<template>
+  <view class="font-bold text-base bg-white" @click="toChange">
+    <view class="border-b-solid border-b-1 border-b-gray-200">
+      <view class="mx-3 flex items-center h-100">
+        <view class="w-168">有效期</view>
+        <view class="ml-a flex items-center">
+          <view v-if="startDate && endDate" class="mr-2">
+            <view>{{ timeFormat(startDate, 'yyyy-mm-dd') }}</view>
+            <view>{{ timeFormat(endDate, 'yyyy-mm-dd') }}</view>
+          </view>
+          <up-icon name="arrow-right"></up-icon>
+        </view>
+      </view>
+    </view>
+    <view v-if="weekDays" class="border-b-solid border-b-1 border-b-gray-200">
+      <view class="mx-3 flex items-center h-100">
+        <view class="w-168">有效日</view>
+        <view class="ml-a mr-2">{{ $lock.convertWeekDaysToChineseString(weekDays) }}</view>
+        <up-icon name="arrow-right"></up-icon>
+      </view>
+    </view>
+    <view v-if="startDate && endDate">
+      <view class="mx-3 flex items-center h-100">
+        <view class="w-168">有效时间</view>
+        <view class="ml-a mr-2"
+          >{{ timeFormat(startDate, 'h:M') }}-{{ timeFormat(endDate, 'h:M') }}</view
+        >
+        <up-icon name="arrow-right"></up-icon>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { ref } from 'vue'
+  import { timeFormat } from 'uview-plus'
+  import { useBasicStore } from '@/stores/basic'
+  import { useLockStore } from '@/stores/lock'
+
+  const $basic = useBasicStore()
+  const $lock = useLockStore()
+
+  const startDate = ref(null)
+  const endDate = ref(null)
+  const weekDays = ref(null)
+
+  const emits = defineEmits(['change'])
+
+  const toChange = () => {
+    $basic.routeJump({
+      name: 'cycleDate',
+      params: {
+        info: JSON.stringify({
+          startDate: startDate.value,
+          endDate: endDate.value,
+          weekDays: weekDays.value
+        })
+      },
+      events: {
+        change(data) {
+          startDate.value = data.startDate
+          endDate.value = data.endDate
+          weekDays.value = data.weekDays
+          emits('change', data)
+        }
+      }
+    })
+  }
+</script>

components/LockDateHourPicker/LockDateHourPicker.vue

@@ -0,0 +1,267 @@
+<template>
+  <view>
+    <view @click="openPicker" class="flex items-center bg-white font-bold text-base h-100 w-full">
+      <view class="w-168 ml-4 leading-[100rpx]">{{ title }}</view>
+      <view class="mr-4 text-right w-[518rpx] h-100 leading-[100rpx]">
+        {{ timeFormat(value, 'yyyy-mm-dd h:M') }}
+      </view>
+    </view>
+
+    <up-popup :show="show" @close="closePicker" mode="bottom" bgColor="transparent" round="32rpx">
+      <view class="w-750 bg-white">
+        <view class="flex justify-between items-center px-4 py-3 text-lg">
+          <text class="text-gray-500" @click="closePicker">取消</text>
+          <text class="font-bold">{{ title }}</text>
+          <text class="text-blue-500" @click="confirmSelection">确定</text>
+        </view>
+
+        <picker-view
+          :value="pickerIndex"
+          class="h-250px"
+          indicator-style="height:50px"
+          @change="onPickerChange"
+          :immediate-change="true"
+        >
+          <picker-view-column>
+            <view v-for="year in years" :key="year" class="text-center text-lg leading-10"
+              >{{ year }}年</view
+            >
+          </picker-view-column>
+          <picker-view-column>
+            <view v-for="month in months" :key="month" class="text-center text-lg leading-10"
+              >{{ month }}月</view
+            >
+          </picker-view-column>
+          <picker-view-column>
+            <view v-for="day in days" :key="day" class="text-center text-lg leading-10"
+              >{{ day }}日</view
+            >
+          </picker-view-column>
+          <picker-view-column>
+            <view v-for="hour in hours" :key="hour" class="text-center text-lg leading-10"
+              >{{ hour }}时</view
+            >
+          </picker-view-column>
+        </picker-view>
+      </view>
+    </up-popup>
+  </view>
+</template>
+
+<script setup>
+  import { ref, watch, computed } from 'vue'
+  import { timeFormat } from 'uview-plus'
+
+  const props = defineProps({
+    title: { type: String, default: '请选择时间' },
+    value: { type: String, default: '' },
+    minDate: { type: Number, required: true },
+    maxDate: { type: Number, required: true }
+  })
+
+  const emit = defineEmits(['changeTime'])
+
+  const openPicker = () => {
+    show.value = true
+    initPickerData(props.value)
+  }
+
+  const closePicker = () => {
+    show.value = false
+  }
+
+  const parseDate = timestamp => {
+    const date = new Date(timestamp)
+    return {
+      year: date.getFullYear(),
+      month: date.getMonth() + 1,
+      day: date.getDate(),
+      hour: date.getHours()
+    }
+  }
+
+  const minDateParsed = computed(() => parseDate(props.minDate))
+  const maxDateParsed = computed(() => parseDate(props.maxDate))
+
+  const show = ref(false)
+  const years = ref([])
+  const months = ref([])
+  const days = ref([])
+  const hours = ref([])
+  const pickerIndex = ref([0, 0, 0, 0])
+  const tempPickerValue = ref({
+    year: 0,
+    month: 0,
+    day: 0,
+    hour: 0
+  })
+
+  const generateYears = () => {
+    const minYear = minDateParsed.value.year
+    const maxYear = maxDateParsed.value.year
+    return Array.from({ length: maxYear - minYear + 1 }, (_, i) => minYear + i)
+  }
+
+  const updateMonths = year => {
+    let monthsList = []
+    const minMonth = year === minDateParsed.value.year ? minDateParsed.value.month : 1
+    const maxMonth = year === maxDateParsed.value.year ? maxDateParsed.value.month : 12
+
+    for (let month = minMonth; month <= maxMonth; month++) {
+      monthsList.push(month)
+    }
+    months.value = monthsList
+    return monthsList
+  }
+
+  const updateDays = (year, month) => {
+    const daysInMonth = new Date(year, month, 0).getDate()
+    let minDay = 1
+    let maxDay = daysInMonth
+
+    if (year === minDateParsed.value.year && month === minDateParsed.value.month) {
+      minDay = minDateParsed.value.day
+    }
+
+    if (year === maxDateParsed.value.year && month === maxDateParsed.value.month) {
+      maxDay = maxDateParsed.value.day
+    }
+
+    maxDay = Math.min(maxDay, daysInMonth)
+
+    if (minDay > maxDay) {
+      days.value = [1]
+      return [1]
+    }
+
+    const daysList = Array.from({ length: maxDay - minDay + 1 }, (_, i) => minDay + i)
+    days.value = daysList
+    return daysList
+  }
+
+  const updateHours = (year, month, day) => {
+    let startHour = 0
+    let endHour = 24
+
+    if (
+      year === minDateParsed.value.year &&
+      month === minDateParsed.value.month &&
+      day === minDateParsed.value.day
+    ) {
+      startHour = minDateParsed.value.hour
+    }
+
+    if (
+      year === maxDateParsed.value.year &&
+      month === maxDateParsed.value.month &&
+      day === maxDateParsed.value.day
+    ) {
+      endHour = maxDateParsed.value.hour
+    }
+
+    const hoursList = Array.from({ length: endHour - startHour + 1 }, (_, i) => startHour + i)
+    hours.value = hoursList
+    return hoursList
+  }
+
+  const onPickerChange = event => {
+    const [yearIndex, monthIndex, dayIndex, hourIndex] = event.detail.value
+    const selectedYear = years.value[yearIndex]
+
+    const updatedMonths = updateMonths(selectedYear)
+    let selectedMonth = updatedMonths[Math.max(0, Math.min(monthIndex, updatedMonths.length - 1))]
+    if (selectedYear === minDateParsed.value.year) {
+      selectedMonth = Math.max(selectedMonth, minDateParsed.value.month)
+    }
+
+    const updatedDays = updateDays(selectedYear, selectedMonth)
+    let selectedDay = updatedDays[Math.max(0, Math.min(dayIndex, updatedDays.length - 1))]
+    if (selectedYear === minDateParsed.value.year && selectedMonth === minDateParsed.value.month) {
+      selectedDay = Math.max(selectedDay, minDateParsed.value.day)
+    }
+
+    const updatedHours = updateHours(selectedYear, selectedMonth, selectedDay)
+    let selectedHour = updatedHours[Math.max(0, Math.min(hourIndex, updatedHours.length - 1))]
+    if (
+      selectedYear === minDateParsed.value.year &&
+      selectedMonth === minDateParsed.value.month &&
+      selectedDay === minDateParsed.value.day
+    ) {
+      selectedHour = Math.max(selectedHour, minDateParsed.value.hour)
+    }
+
+    tempPickerValue.value = {
+      year: selectedYear,
+      month: selectedMonth,
+      day: selectedDay,
+      hour: selectedHour
+    }
+
+    pickerIndex.value = [
+      yearIndex,
+      updatedMonths.indexOf(selectedMonth),
+      updatedDays.indexOf(selectedDay),
+      updatedHours.indexOf(selectedHour)
+    ]
+  }
+
+  const initPickerData = timestamp => {
+    if (!timestamp) {
+      timestamp = props.minDate
+    }
+
+    const date = new Date(timestamp)
+    let year = date.getFullYear()
+    let month = date.getMonth() + 1
+    let day = date.getDate()
+    let hour = date.getHours()
+
+    if (hour === 24) {
+      hour = 0
+      const nextDay = new Date(date)
+      nextDay.setDate(date.getDate() + 1)
+      year = nextDay.getFullYear()
+      month = nextDay.getMonth() + 1
+      day = nextDay.getDate()
+    }
+
+    if (year === minDateParsed.value.year) {
+      month = Math.max(month, minDateParsed.value.month)
+      if (month === minDateParsed.value.month) {
+        day = Math.max(day, minDateParsed.value.day)
+        if (day === minDateParsed.value.day) {
+          hour = Math.max(hour, minDateParsed.value.hour)
+        }
+      }
+    }
+
+    years.value = generateYears()
+    const updatedMonths = updateMonths(year)
+    const updatedDays = updateDays(year, month)
+    const updatedHours = updateHours(year, month, day)
+
+    tempPickerValue.value = {
+      year,
+      month,
+      day,
+      hour
+    }
+
+    pickerIndex.value = [
+      years.value.indexOf(year),
+      updatedMonths.indexOf(month),
+      updatedDays.indexOf(day),
+      updatedHours.indexOf(hour)
+    ]
+  }
+
+  watch(() => props.value, initPickerData, { immediate: true })
+
+  const confirmSelection = () => {
+    const { year, month, day, hour } = tempPickerValue.value
+
+    const selectedDate = new Date(year, month - 1, day, hour, 0, 0, 0)
+    emit('changeTime', selectedDate.getTime())
+    show.value = false
+  }
+</script>

pages.json

@@ -323,6 +323,13 @@
         "navigationBarTitleText": "操作记录",
         "disableScroll": true
       }
+    },
+    {
+      "path": "pages/cycleDate/cycleDate",
+      "style": {
+        "navigationBarTitleText": "有效期",
+        "disableScroll": true
+      }
     }
   ],
   "globalStyle": {

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
           })

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
           })

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),

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

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
           })

pages/createCard/createCard.vue

@@ -46,7 +46,7 @@
         </view>
         <view class="button" @click="create('permanent')">下一步</view>
       </swiper-item>
-      <swiper-item :style="{ height: deviceInfo.windowHeight - 44 + 'px' }">
+      <swiper-item>
         <LockInput
           :value="temporaryName"
           title="姓名"
@@ -59,7 +59,6 @@
             :value="temporaryStartTime"
             :minDate="minDate"
             :maxDate="maxDate"
-            type="datehour"
             @change-time="changeDate('temporaryStartTime', $event)"
           ></LockDatetimePicker>
         </view>
@@ -69,7 +68,6 @@
             :value="temporaryEndTime"
             :minDate="minDate"
             :maxDate="maxDate"
-            type="datehour"
             @change-time="changeDate('temporaryEndTime', $event)"
           ></LockDatetimePicker>
         </view>
@@ -90,6 +88,33 @@
         </view>
         <view class="button" @click="create('temporary')">下一步</view>
       </swiper-item>
+      <swiper-item>
+        <LockInput
+          :value="cycleName"
+          title="姓名"
+          placeholder="请输入"
+          @change-input="changeName('cycle', $event)"
+        ></LockInput>
+        <view class="mt-3">
+          <LockCycle @change="changeCycle"></LockCycle>
+        </view>
+        <view class="mt-3">
+          <LockSwitch
+            :value="cycleAdmin"
+            title="是否为管理员"
+            @change="changeAdmin('cycle', $event)"
+          ></LockSwitch>
+        </view>
+        <view class="mt-3 mb-3">
+          <LockSwitch
+            :value="cycleCoerced"
+            title="胁迫卡"
+            @change="changeCoerced('cycle', $event)"
+            :placeholder="placeholder"
+          ></LockSwitch>
+        </view>
+        <view class="button" @click="create('cycle')">下一步</view>
+      </swiper-item>
     </swiper>
   </view>
 </template>
@@ -97,6 +122,7 @@
 <script setup>
   import { getCurrentInstance, ref } from 'vue'
   import { onLoad } from '@dcloudio/uni-app'
+  import { timeFormat } from 'uview-plus'
   import { useBasicStore } from '@/stores/basic'
   import { useUserStore } from '@/stores/user'
   import { useBluetoothStore } from '@/stores/bluetooth'
@@ -115,6 +141,9 @@
     },
     {
       name: '限时'
+    },
+    {
+      name: '循环'
     }
   ]
 
@@ -128,6 +157,13 @@
   const temporaryAdmin = ref(false)
   const temporaryCoerced = ref(false)
 
+  const cycleName = ref('')
+  const cycleStartTime = ref(null)
+  const cycleEndTime = ref(null)
+  const weekDays = ref([])
+  const cycleAdmin = ref(false)
+  const cycleCoerced = ref(false)
+
   const minDate = ref(Number(new Date()))
   const maxDate = ref(Number(4133951940000))
   const currentIndex = ref(0)
@@ -143,6 +179,12 @@
     maxDate.value = Number(getFutureTimestamp())
   })
 
+  const changeCycle = data => {
+    cycleStartTime.value = data.startDate
+    cycleEndTime.value = data.endDate
+    weekDays.value = data.weekDays
+  }
+
   const getNextFullHour = () => {
     const now = new Date()
     const currentHour = now.getHours()
@@ -176,7 +218,8 @@
   const create = async type => {
     if (
       (type === 'temporary' && temporaryName.value === '') ||
-      (type === 'permanent' && permanentName.value === '')
+      (type === 'permanent' && permanentName.value === '') ||
+      (type === 'cycle' && cycleName.value === '')
     ) {
       uni.showToast({
         title: '名称不能为空',
@@ -193,6 +236,14 @@
       return
     }
 
+    if (type === 'cycle' && weekDays.value.length === 0) {
+      uni.showToast({
+        title: '请选择有效期',
+        icon: 'none'
+      })
+      return
+    }
+
     const netWork = await $basic.getNetworkType()
     if (!netWork) {
       return
@@ -221,7 +272,7 @@
         startTime: '00:00',
         endTime: '00:00'
       }
-    } else {
+    } else if (type === 'temporary') {
       params = {
         ...params,
         cardName: temporaryName.value,
@@ -235,6 +286,20 @@
         startTime: '00:00',
         endTime: '00:00'
       }
+    } else {
+      params = {
+        ...params,
+        cardName: cycleName.value,
+        isAdmin: cycleAdmin.value ? 1 : 0,
+        isForce: cycleCoerced.value ? 1 : 0,
+        weekDays: weekDays.value,
+        cardType: 4,
+        isRound: 1,
+        startDate: cycleStartTime.value,
+        endDate: cycleEndTime.value,
+        startTime: timeFormat(new Date(cycleStartTime.value), 'h:M'),
+        endTime: timeFormat(new Date(cycleEndTime.value), 'h:M')
+      }
     }
 
     const { code, message } = await checkCardNameRequest({
@@ -264,8 +329,10 @@
   const changeName = (type, event) => {
     if (type === 'permanent') {
       permanentName.value = event
-    } else {
+    } else if (type === 'temporary') {
       temporaryName.value = event
+    } else {
+      cycleName.value = event
     }
   }
 
@@ -280,16 +347,20 @@
   const changeAdmin = (type, event) => {
     if (type === 'permanent') {
       permanentAdmin.value = event.detail.value
-    } else {
+    } else if (type === 'temporary') {
       temporaryAdmin.value = event.detail.value
+    } else {
+      cycleAdmin.value = event.detail.value
     }
   }
 
   const changeCoerced = (type, event) => {
     if (type === 'permanent') {
       permanentCoerced.value = event.detail.value
-    } else {
+    } else if (type === 'temporary') {
       temporaryCoerced.value = event.detail.value
+    } else {
+      cycleCoerced.value = event.detail.value
     }
   }
 

pages/createFace/createFace.vue

@@ -38,7 +38,7 @@
         </view>
         <view class="button mt-5" @click="create('permanent')">下一步</view>
       </swiper-item>
-      <swiper-item :style="{ height: deviceInfo.windowHeight - 44 + 'px' }">
+      <swiper-item>
         <LockInput
           :value="temporaryName"
           title="姓名"
@@ -51,7 +51,6 @@
             :value="temporaryStartTime"
             :minDate="minDate"
             :maxDate="maxDate"
-            type="datehour"
             @change-time="changeDate('temporaryStartTime', $event)"
           ></LockDatetimePicker>
         </view>
@@ -61,7 +60,6 @@
             :value="temporaryEndTime"
             :minDate="minDate"
             :maxDate="maxDate"
-            type="datehour"
             @change-time="changeDate('temporaryEndTime', $event)"
           ></LockDatetimePicker>
         </view>
@@ -74,6 +72,26 @@
         </view>
         <view class="button mt-5" @click="create('temporary')">下一步</view>
       </swiper-item>
+
+      <swiper-item>
+        <LockInput
+          :value="cycleName"
+          title="姓名"
+          placeholder="请输入"
+          @change-input="changeName('cycle', $event)"
+        ></LockInput>
+        <view class="mt-3">
+          <LockCycle @change="changeCycle"></LockCycle>
+        </view>
+        <view class="mt-3">
+          <LockSwitch
+            :value="cycleAdmin"
+            title="是否为管理员"
+            @change="changeAdmin('cycle', $event)"
+          ></LockSwitch>
+        </view>
+        <view class="button mt-5" @click="create('cycle')">下一步</view>
+      </swiper-item>
     </swiper>
   </view>
 </template>
@@ -81,6 +99,7 @@
 <script setup>
   import { getCurrentInstance, ref } from 'vue'
   import { onLoad } from '@dcloudio/uni-app'
+  import { timeFormat } from 'uview-plus'
   import { useBasicStore } from '@/stores/basic'
   import { useUserStore } from '@/stores/user'
   import { useBluetoothStore } from '@/stores/bluetooth'
@@ -99,6 +118,9 @@
     },
     {
       name: '限时'
+    },
+    {
+      name: '循环'
     }
   ]
 
@@ -110,6 +132,12 @@
   const temporaryEndTime = ref(Number(new Date()))
   const temporaryAdmin = ref(false)
 
+  const cycleName = ref('')
+  const cycleStartTime = ref(null)
+  const cycleEndTime = ref(null)
+  const weekDays = ref([])
+  const cycleAdmin = ref(false)
+
   const minDate = ref(Number(new Date()))
   const maxDate = ref(Number(4133951940000))
   const currentIndex = ref(0)
@@ -123,6 +151,12 @@
     maxDate.value = Number(getFutureTimestamp())
   })
 
+  const changeCycle = data => {
+    cycleStartTime.value = data.startDate
+    cycleEndTime.value = data.endDate
+    weekDays.value = data.weekDays
+  }
+
   const getNextFullHour = () => {
     const now = new Date()
     const currentHour = now.getHours()
@@ -156,7 +190,8 @@
   const create = async type => {
     if (
       (type === 'temporary' && temporaryName.value === '') ||
-      (type === 'permanent' && permanentName.value === '')
+      (type === 'permanent' && permanentName.value === '') ||
+      (type === 'cycle' && cycleName.value === '')
     ) {
       uni.showToast({
         title: '名称不能为空',
@@ -173,6 +208,14 @@
       return
     }
 
+    if (type === 'cycle' && weekDays.value.length === 0) {
+      uni.showToast({
+        title: '请选择有效期',
+        icon: 'none'
+      })
+      return
+    }
+
     const netWork = await $basic.getNetworkType()
     if (!netWork) {
       return
@@ -200,7 +243,7 @@
         startTime: '00:00',
         endTime: '00:00'
       }
-    } else {
+    } else if (type === 'temporary') {
       params = {
         ...params,
         faceName: temporaryName.value,
@@ -213,6 +256,19 @@
         startTime: '00:00',
         endTime: '00:00'
       }
+    } else {
+      params = {
+        ...params,
+        faceName: cycleName.value,
+        isAdmin: cycleAdmin.value ? 1 : 0,
+        weekDays: weekDays.value,
+        faceType: 4,
+        isRound: 1,
+        startDate: cycleStartTime.value,
+        endDate: cycleEndTime.value,
+        startTime: timeFormat(new Date(cycleStartTime.value), 'h:M'),
+        endTime: timeFormat(new Date(cycleEndTime.value), 'h:M')
+      }
     }
 
     const { code, message } = await checkFaceNameRequest({
@@ -242,8 +298,10 @@
   const changeName = (type, event) => {
     if (type === 'permanent') {
       permanentName.value = event
-    } else {
+    } else if (type === 'temporary') {
       temporaryName.value = event
+    } else {
+      cycleName.value = event
     }
   }
 
@@ -258,8 +316,10 @@
   const changeAdmin = (type, event) => {
     if (type === 'permanent') {
       permanentAdmin.value = event.detail.value
-    } else {
+    } else if (type === 'temporary') {
       temporaryAdmin.value = event.detail.value
+    } else {
+      cycleAdmin.value = event.detail.value
     }
   }
 

pages/createFingerprint/createFingerprint.vue

@@ -46,7 +46,7 @@
         </view>
         <view class="button" @click="create('permanent')">下一步</view>
       </swiper-item>
-      <swiper-item :style="{ height: deviceInfo.windowHeight - 44 + 'px' }">
+      <swiper-item>
         <LockInput
           :value="temporaryName"
           title="姓名"
@@ -59,7 +59,6 @@
             :value="temporaryStartTime"
             :minDate="minDate"
             :maxDate="maxDate"
-            type="datehour"
             @change-time="changeDate('temporaryStartTime', $event)"
           ></LockDatetimePicker>
         </view>
@@ -69,7 +68,6 @@
             :value="temporaryEndTime"
             :minDate="minDate"
             :maxDate="maxDate"
-            type="datehour"
             @change-time="changeDate('temporaryEndTime', $event)"
           ></LockDatetimePicker>
         </view>
@@ -90,6 +88,33 @@
         </view>
         <view class="button" @click="create('temporary')">下一步</view>
       </swiper-item>
+      <swiper-item>
+        <LockInput
+          :value="cycleName"
+          title="姓名"
+          placeholder="请输入"
+          @change-input="changeName('cycle', $event)"
+        ></LockInput>
+        <view class="mt-3">
+          <LockCycle @change="changeCycle"></LockCycle>
+        </view>
+        <view class="mt-3">
+          <LockSwitch
+            :value="cycleAdmin"
+            title="是否为管理员"
+            @change="changeAdmin('cycle', $event)"
+          ></LockSwitch>
+        </view>
+        <view class="mt-3 mb-3">
+          <LockSwitch
+            :value="cycleCoerced"
+            title="胁迫指纹"
+            @change="changeCoerced('cycle', $event)"
+            :placeholder="placeholder"
+          ></LockSwitch>
+        </view>
+        <view class="button" @click="create('cycle')">下一步</view>
+      </swiper-item>
     </swiper>
   </view>
 </template>
@@ -97,6 +122,7 @@
 <script setup>
   import { getCurrentInstance, ref } from 'vue'
   import { onLoad } from '@dcloudio/uni-app'
+  import { timeFormat } from 'uview-plus'
   import { useBasicStore } from '@/stores/basic'
   import { useUserStore } from '@/stores/user'
   import { useBluetoothStore } from '@/stores/bluetooth'
@@ -115,6 +141,9 @@
     },
     {
       name: '限时'
+    },
+    {
+      name: '循环'
     }
   ]
 
@@ -128,6 +157,13 @@
   const temporaryAdmin = ref(false)
   const temporaryCoerced = ref(false)
 
+  const cycleName = ref('')
+  const cycleStartTime = ref(null)
+  const cycleEndTime = ref(null)
+  const weekDays = ref([])
+  const cycleAdmin = ref(false)
+  const cycleCoerced = ref(false)
+
   const minDate = ref(Number(new Date()))
   const maxDate = ref(Number(4133951940000))
   const currentIndex = ref(0)
@@ -143,6 +179,12 @@
     maxDate.value = Number(getFutureTimestamp())
   })
 
+  const changeCycle = data => {
+    cycleStartTime.value = data.startDate
+    cycleEndTime.value = data.endDate
+    weekDays.value = data.weekDays
+  }
+
   const getNextFullHour = () => {
     const now = new Date()
     const currentHour = now.getHours()
@@ -176,7 +218,8 @@
   const create = async type => {
     if (
       (type === 'temporary' && temporaryName.value === '') ||
-      (type === 'permanent' && permanentName.value === '')
+      (type === 'permanent' && permanentName.value === '') ||
+      (type === 'cycle' && cycleName.value === '')
     ) {
       uni.showToast({
         title: '名称不能为空',
@@ -193,6 +236,14 @@
       return
     }
 
+    if (type === 'cycle' && weekDays.value.length === 0) {
+      uni.showToast({
+        title: '请选择有效期',
+        icon: 'none'
+      })
+      return
+    }
+
     const netWork = await $basic.getNetworkType()
     if (!netWork) {
       return
@@ -221,7 +272,7 @@
         startTime: '00:00',
         endTime: '00:00'
       }
-    } else {
+    } else if (type === 'temporary') {
       params = {
         ...params,
         fingerprintName: temporaryName.value,
@@ -235,6 +286,20 @@
         startTime: '00:00',
         endTime: '00:00'
       }
+    } else {
+      params = {
+        ...params,
+        fingerprintName: cycleName.value,
+        isAdmin: cycleAdmin.value ? 1 : 0,
+        isForce: cycleCoerced.value ? 1 : 0,
+        weekDays: weekDays.value,
+        fingerprintType: 4,
+        isRound: 1,
+        startDate: cycleStartTime.value,
+        endDate: cycleEndTime.value,
+        startTime: timeFormat(new Date(cycleStartTime.value), 'h:M'),
+        endTime: timeFormat(new Date(cycleEndTime.value), 'h:M')
+      }
     }
 
     const { code, message } = await checkFingerprintNameRequest({
@@ -264,8 +329,10 @@
   const changeName = (type, event) => {
     if (type === 'permanent') {
       permanentName.value = event
-    } else {
+    } else if (type === 'temporary') {
       temporaryName.value = event
+    } else {
+      cycleName.value = event
     }
   }
 
@@ -280,16 +347,20 @@
   const changeAdmin = (type, event) => {
     if (type === 'permanent') {
       permanentAdmin.value = event.detail.value
-    } else {
+    } else if (type === 'temporary') {
       temporaryAdmin.value = event.detail.value
+    } else {
+      cycleAdmin.value = event.detail.value
     }
   }
 
   const changeCoerced = (type, event) => {
     if (type === 'permanent') {
       permanentCoerced.value = event.detail.value
-    } else {
+    } else if (type === 'temporary') {
       temporaryCoerced.value = event.detail.value
+    } else {
+      cycleCoerced.value = event.detail.value
     }
   }
 

pages/createPalmVein/createPalmVein.vue

@@ -46,7 +46,7 @@
         </view>
         <view class="button" @click="create('permanent')">下一步</view>
       </swiper-item>
-      <swiper-item :style="{ height: deviceInfo.windowHeight - 44 + 'px' }">
+      <swiper-item>
         <LockInput
           :value="temporaryName"
           title="姓名"
@@ -59,7 +59,6 @@
             :value="temporaryStartTime"
             :minDate="minDate"
             :maxDate="maxDate"
-            type="datehour"
             @change-time="changeDate('temporaryStartTime', $event)"
           ></LockDatetimePicker>
         </view>
@@ -69,7 +68,6 @@
             :value="temporaryEndTime"
             :minDate="minDate"
             :maxDate="maxDate"
-            type="datehour"
             @change-time="changeDate('temporaryEndTime', $event)"
           ></LockDatetimePicker>
         </view>
@@ -90,6 +88,34 @@
         </view>
         <view class="button" @click="create('temporary')">下一步</view>
       </swiper-item>
+
+      <swiper-item>
+        <LockInput
+          :value="cycleName"
+          title="姓名"
+          placeholder="请输入"
+          @change-input="changeName('cycle', $event)"
+        ></LockInput>
+        <view class="mt-3">
+          <LockCycle @change="changeCycle"></LockCycle>
+        </view>
+        <view class="mt-3">
+          <LockSwitch
+            :value="cycleAdmin"
+            title="是否为管理员"
+            @change="changeAdmin('cycle', $event)"
+          ></LockSwitch>
+        </view>
+        <view class="mt-3 mb-3">
+          <LockSwitch
+            :value="cycleCoerced"
+            title="胁迫掌静脉"
+            @change="changeCoerced('cycle', $event)"
+            :placeholder="placeholder"
+          ></LockSwitch>
+        </view>
+        <view class="button" @click="create('cycle')">下一步</view>
+      </swiper-item>
     </swiper>
   </view>
 </template>
@@ -101,6 +127,7 @@
   import { useUserStore } from '@/stores/user'
   import { useBluetoothStore } from '@/stores/bluetooth'
   import { checkPalmVeinNameRequest } from '@/api/palmVein'
+  import { timeFormat } from 'uview-plus'
 
   const instance = getCurrentInstance().proxy
   const eventChannel = instance.getOpenerEventChannel()
@@ -115,6 +142,9 @@
     },
     {
       name: '限时'
+    },
+    {
+      name: '循环'
     }
   ]
 
@@ -128,6 +158,13 @@
   const temporaryAdmin = ref(false)
   const temporaryCoerced = ref(false)
 
+  const cycleName = ref('')
+  const cycleStartTime = ref(null)
+  const cycleEndTime = ref(null)
+  const weekDays = ref([])
+  const cycleAdmin = ref(false)
+  const cycleCoerced = ref(false)
+
   const minDate = ref(Number(new Date()))
   const maxDate = ref(Number(4133951940000))
   const currentIndex = ref(0)
@@ -143,6 +180,12 @@
     maxDate.value = Number(getFutureTimestamp())
   })
 
+  const changeCycle = data => {
+    cycleStartTime.value = data.startDate
+    cycleEndTime.value = data.endDate
+    weekDays.value = data.weekDays
+  }
+
   const getNextFullHour = () => {
     const now = new Date()
     const currentHour = now.getHours()
@@ -176,7 +219,8 @@
   const create = async type => {
     if (
       (type === 'temporary' && temporaryName.value === '') ||
-      (type === 'permanent' && permanentName.value === '')
+      (type === 'permanent' && permanentName.value === '') ||
+      (type === 'cycle' && cycleName.value === '')
     ) {
       uni.showToast({
         title: '名称不能为空',
@@ -193,6 +237,14 @@
       return
     }
 
+    if (type === 'cycle' && weekDays.value.length === 0) {
+      uni.showToast({
+        title: '请选择有效期',
+        icon: 'none'
+      })
+      return
+    }
+
     const netWork = await $basic.getNetworkType()
     if (!netWork) {
       return
@@ -221,7 +273,7 @@
         startTime: '00:00',
         endTime: '00:00'
       }
-    } else {
+    } else if (type === 'temporary') {
       params = {
         ...params,
         palmVeinName: temporaryName.value,
@@ -235,6 +287,20 @@
         startTime: '00:00',
         endTime: '00:00'
       }
+    } else {
+      params = {
+        ...params,
+        palmVeinName: cycleName.value,
+        isAdmin: cycleAdmin.value ? 1 : 0,
+        isForce: cycleCoerced.value ? 1 : 0,
+        weekDays: weekDays.value,
+        palmVeinType: 4,
+        isRound: 1,
+        startDate: cycleStartTime.value,
+        endDate: cycleEndTime.value,
+        startTime: timeFormat(new Date(cycleStartTime.value), 'h:M'),
+        endTime: timeFormat(new Date(cycleEndTime.value), 'h:M')
+      }
     }
 
     const { code, message } = await checkPalmVeinNameRequest({
@@ -264,8 +330,10 @@
   const changeName = (type, event) => {
     if (type === 'permanent') {
       permanentName.value = event
-    } else {
+    } else if (type === 'temporary') {
       temporaryName.value = event
+    } else {
+      cycleName.value = event
     }
   }
 
@@ -280,16 +348,20 @@
   const changeAdmin = (type, event) => {
     if (type === 'permanent') {
       permanentAdmin.value = event.detail.value
-    } else {
+    } else if (type === 'temporary') {
       temporaryAdmin.value = event.detail.value
+    } else {
+      cycleAdmin.value = event.detail.value
     }
   }
 
   const changeCoerced = (type, event) => {
     if (type === 'permanent') {
       permanentCoerced.value = event.detail.value
-    } else {
+    } else if (type === 'temporary') {
       temporaryCoerced.value = event.detail.value
+    } else {
+      cycleCoerced.value = event.detail.value
     }
   }
 

pages/createPassword/createPassword.vue

@@ -40,14 +40,14 @@
           @change-input="changeTemporaryInput"
         ></LockInput>
         <view style="margin-top: 20rpx">
-          <LockDatetimePicker
+          <LockDateHourPicker
             title="失效时间"
             :value="temporaryTime"
             :minDate="minDate"
             :maxDate="maxDate"
             type="datehour"
             @change-time="changeTemporaryTime"
-          ></LockDatetimePicker>
+          ></LockDateHourPicker>
         </view>
         <view class="text">{{ text }}</view>
         <view class="button" @click="createPassword('temporary')">获取密码</view>
@@ -60,7 +60,7 @@
   import { mapActions, mapState } from 'pinia'
   import { useBasicStore } from '@/stores/basic'
   import LockInput from '@/components/LockInput/LockInput.vue'
-  import LockDatetimePicker from '@/components/LockDatetimePicker/LockDatetimePicker.vue'
+  import LockDateHourPicker from '@/components/LockDateHourPicker/LockDateHourPicker.vue'
   import { createPsaawordRequest } from '@/api/keyboardPwd'
   import { useBluetoothStore } from '@/stores/bluetooth'
   import { useLockStore } from '@/stores/lock'
@@ -68,7 +68,7 @@
   export default {
     components: {
       LockInput,
-      LockDatetimePicker
+      LockDateHourPicker
     },
     data() {
       return {
@@ -97,17 +97,16 @@
     },
     async onLoad() {
       this.deviceInfo = await this.getDeviceInfo()
-      this.temporaryTime = this.setTime()
+      this.temporaryTime = Number(this.getNextFullHour())
       this.minDate = Number(this.getNextFullHour())
       this.maxDate = Number(this.getFutureTimestamp())
     },
     methods: {
       ...mapActions(useBasicStore, ['getDeviceInfo', 'backAndToast', 'getNetworkType']),
       ...mapActions(useLockStore, ['getPasswordList', 'updatePasswordSearch']),
-      // 获取下一个整点时间
       getNextFullHour() {
         const now = new Date()
-        const currentHour = now.getHours()
+        const currentHour = now.getHours() + 1
         now.setHours(currentHour)
         now.setMinutes(0)
         now.setSeconds(0)
@@ -126,12 +125,6 @@
 
         return futureDate.getTime()
       },
-      setTime() {
-        const now = new Date()
-        now.setMinutes(0, 0, 0)
-
-        return now.getTime()
-      },
       async createPassword(type) {
         const that = this
         if (

pages/createRemote/createRemote.vue

@@ -31,7 +31,7 @@
         ></LockInput>
         <view class="button mt-5" @click="create('permanent')">下一步</view>
       </swiper-item>
-      <swiper-item :style="{ height: deviceInfo.windowHeight - 44 + 'px' }">
+      <swiper-item>
         <LockInput
           :value="temporaryName"
           title="姓名"
@@ -44,7 +44,6 @@
             :value="temporaryStartTime"
             :minDate="minDate"
             :maxDate="maxDate"
-            type="datehour"
             @change-time="changeDate('temporaryStartTime', $event)"
           ></LockDatetimePicker>
         </view>
@@ -54,12 +53,24 @@
             :value="temporaryEndTime"
             :minDate="minDate"
             :maxDate="maxDate"
-            type="datehour"
             @change-time="changeDate('temporaryEndTime', $event)"
           ></LockDatetimePicker>
         </view>
         <view class="button mt-5" @click="create('temporary')">下一步</view>
       </swiper-item>
+
+      <swiper-item>
+        <LockInput
+          :value="cycleName"
+          title="姓名"
+          placeholder="请输入"
+          @change-input="changeName('cycle', $event)"
+        ></LockInput>
+        <view class="mt-3">
+          <LockCycle @change="changeCycle"></LockCycle>
+        </view>
+        <view class="button mt-5" @click="create('cycle')">下一步</view>
+      </swiper-item>
     </swiper>
   </view>
 </template>
@@ -67,6 +78,7 @@
 <script setup>
   import { getCurrentInstance, ref } from 'vue'
   import { onLoad } from '@dcloudio/uni-app'
+  import { timeFormat } from 'uview-plus'
   import { useBasicStore } from '@/stores/basic'
   import { useUserStore } from '@/stores/user'
   import { useBluetoothStore } from '@/stores/bluetooth'
@@ -85,6 +97,9 @@
     },
     {
       name: '限时'
+    },
+    {
+      name: '循环'
     }
   ]
 
@@ -94,6 +109,11 @@
   const temporaryStartTime = ref(Number(new Date()))
   const temporaryEndTime = ref(Number(new Date()))
 
+  const cycleName = ref('')
+  const cycleStartTime = ref(null)
+  const cycleEndTime = ref(null)
+  const weekDays = ref([])
+
   const minDate = ref(Number(new Date()))
   const maxDate = ref(Number(4133951940000))
   const currentIndex = ref(0)
@@ -107,6 +127,12 @@
     maxDate.value = Number(getFutureTimestamp())
   })
 
+  const changeCycle = data => {
+    cycleStartTime.value = data.startDate
+    cycleEndTime.value = data.endDate
+    weekDays.value = data.weekDays
+  }
+
   const getNextFullHour = () => {
     const now = new Date()
     const currentHour = now.getHours()
@@ -140,7 +166,8 @@
   const create = async type => {
     if (
       (type === 'temporary' && temporaryName.value === '') ||
-      (type === 'permanent' && permanentName.value === '')
+      (type === 'permanent' && permanentName.value === '') ||
+      (type === 'cycle' && cycleName.value === '')
     ) {
       uni.showToast({
         title: '名称不能为空',
@@ -157,6 +184,14 @@
       return
     }
 
+    if (type === 'cycle' && weekDays.value.length === 0) {
+      uni.showToast({
+        title: '请选择有效期',
+        icon: 'none'
+      })
+      return
+    }
+
     const netWork = await $basic.getNetworkType()
     if (!netWork) {
       return
@@ -183,7 +218,7 @@
         startTime: '00:00',
         endTime: '00:00'
       }
-    } else {
+    } else if (type === 'temporary') {
       params = {
         ...params,
         remoteName: temporaryName.value,
@@ -195,6 +230,18 @@
         startTime: '00:00',
         endTime: '00:00'
       }
+    } else {
+      params = {
+        ...params,
+        remoteName: cycleName.value,
+        weekDays: weekDays.value,
+        remoteType: 4,
+        isRound: 1,
+        startDate: cycleStartTime.value,
+        endDate: cycleEndTime.value,
+        startTime: timeFormat(new Date(cycleStartTime.value), 'h:M'),
+        endTime: timeFormat(new Date(cycleEndTime.value), 'h:M')
+      }
     }
 
     const { code, message } = await checkRemoteNameRequest({
@@ -224,8 +271,10 @@
   const changeName = (type, event) => {
     if (type === 'permanent') {
       permanentName.value = event
-    } else {
+    } else if (type === 'temporary') {
       temporaryName.value = event
+    } else {
+      cycleName.value = event
     }
   }
 

pages/cycleDate/cycleDate.vue

@@ -0,0 +1,269 @@
+<template>
+  <view>
+    <view class="font-bold text-base bg-white">
+      <view class="border-b-solid border-b-1 border-b-gray-200" @click="showStartDate = true">
+        <view class="mx-3 flex items-center h-100">
+          <view class="w-168">生效日期</view>
+          <view class="ml-a flex items-center">
+            <view v-if="startDate" class="mr-2">
+              <view>{{ timeFormat(startDate, 'yyyy-mm-dd') }}</view>
+            </view>
+            <up-icon name="arrow-right"></up-icon>
+          </view>
+        </view>
+      </view>
+      <view>
+        <view class="mx-3 flex items-center h-100" @click="showEndDate = true">
+          <view class="w-168">失效日期</view>
+          <view class="ml-a flex items-center">
+            <view v-if="endDate" class="mr-2">
+              <view>{{ timeFormat(endDate, 'yyyy-mm-dd') }}</view>
+            </view>
+            <up-icon name="arrow-right"></up-icon>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="font-bold text-base bg-white mt-2">
+      <view class="border-b-solid border-b-1 border-b-gray-200">
+        <view class="mx-3">
+          <view class="pt-2">有效日</view>
+          <view class="mr-2 flex items-center justify-around py-2">
+            <view
+              v-for="(item, index) in list"
+              :key="index"
+              :class="[weekDays.includes(index + 1) ? 'bg-#5eb7ac text-white' : '']"
+              @click="
+                weekDays.includes(index + 1)
+                  ? weekDays.splice(weekDays.indexOf(index + 1), 1)
+                  : weekDays.push(index + 1)
+              "
+              class="rounded-50% border-solid border-3 border-gray-400 flex items-center justify-center w-70 h-70"
+              >{{ item }}</view
+            >
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="font-bold text-base bg-white mt-2">
+      <view class="border-b-solid border-b-1 border-b-gray-200" @click="showStartTime = true">
+        <view class="mx-3 flex items-center h-100">
+          <view class="w-168">生效时间</view>
+          <view class="ml-a flex items-center">
+            <view v-if="startTimeText" class="mr-2">
+              <view>{{ startTimeText }}</view>
+            </view>
+            <up-icon name="arrow-right"></up-icon>
+          </view>
+        </view>
+      </view>
+      <view>
+        <view class="mx-3 flex items-center h-100" @click="showEndTime = true">
+          <view class="w-168">失效时间</view>
+          <view class="ml-a flex items-center">
+            <view v-if="endTimeText" class="mr-2">
+              <view>{{ endTimeText }}</view>
+            </view>
+            <up-icon name="arrow-right"></up-icon>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view
+      :class="[
+        canSubmit ? 'bg-[#5eb7ac]' : 'bg-[#9d9da3]',
+        'mx-4',
+        'h-100',
+        'text-white',
+        'text-center',
+        'font-bold',
+        'mt-4',
+        'flex',
+        'items-center',
+        'justify-center'
+      ]"
+      style="border-radius: 50rpx"
+      @click="save"
+      >保存</view
+    >
+    <up-datetime-picker
+      :hasInput="false"
+      :show="showStartDate"
+      v-model="defaultStartDate"
+      mode="date"
+      closeOnClickOverlay
+      :visibleItemCount="5"
+      @close="showStartDate = false"
+      @confirm="confirmDate('start', $event)"
+      @cancel="showStartDate = false"
+    ></up-datetime-picker>
+    <up-datetime-picker
+      :hasInput="false"
+      :show="showEndDate"
+      v-model="defaultEndDate"
+      mode="date"
+      closeOnClickOverlay
+      :visibleItemCount="5"
+      @close="showEndDate = false"
+      @confirm="confirmDate('end', $event)"
+      @cancel="showEndDate = false"
+    ></up-datetime-picker>
+    <up-datetime-picker
+      :hasInput="false"
+      :show="showStartTime"
+      v-model="defaultStartTime"
+      mode="time"
+      closeOnClickOverlay
+      :visibleItemCount="5"
+      @close="showStartTime = false"
+      @confirm="confirmTime('start', $event)"
+      @cancel="showStartTime = false"
+    ></up-datetime-picker>
+    <up-datetime-picker
+      :hasInput="false"
+      :show="showEndTime"
+      v-model="defaultEndTime"
+      mode="time"
+      closeOnClickOverlay
+      :visibleItemCount="5"
+      @close="showEndTime = false"
+      @confirm="confirmTime('end', $event)"
+      @cancel="showEndTime = false"
+    ></up-datetime-picker>
+  </view>
+</template>
+
+<script setup>
+  import { timeFormat } from 'uview-plus'
+  import { computed, getCurrentInstance, ref } from 'vue'
+  import { onLoad } from '@dcloudio/uni-app'
+
+  const instance = getCurrentInstance().proxy
+  const eventChannel = instance.getOpenerEventChannel()
+
+  const showStartDate = ref(false)
+  const showEndDate = ref(false)
+  const showStartTime = ref(false)
+  const showEndTime = ref(false)
+
+  const startDate = ref(null)
+  const endDate = ref(null)
+  const weekDays = ref([])
+
+  const startTimeText = ref(null)
+  const endTimeText = ref(null)
+
+  const defaultStartTime = ref('')
+  const defaultEndTime = ref('')
+  const defaultStartDate = ref(0)
+  const defaultEndDate = ref(0)
+
+  const list = ['一', '二', '三', '四', '五', '六', '日']
+
+  const canSubmit = computed(() => {
+    return (
+      startDate.value &&
+      endDate.value &&
+      weekDays.value.length > 0 &&
+      startTimeText.value &&
+      endTimeText.value
+    )
+  })
+
+  onLoad(options => {
+    if (options.info) {
+      const info = JSON.parse(options.info)
+      if (info.startDate) {
+        weekDays.value = info.weekDays
+        startDate.value = info.startDate
+        endDate.value = info.endDate
+
+        defaultStartDate.value = info.startDate
+        defaultEndDate.value = info.endDate
+        startTimeText.value = timeFormat(info.startDate, 'h:M')
+        endTimeText.value = timeFormat(info.endDate, 'h:M')
+      } else {
+        defaultStartTime.value = timeFormat(new Date(), 'h:M')
+        defaultEndTime.value = timeFormat(new Date(), 'h:M')
+        defaultStartDate.value = new Date().getTime()
+        defaultEndDate.value = new Date().getTime()
+      }
+    }
+  })
+
+  const compareTime = (time1, time2) => {
+    const [h1, m1] = time1.split(':').map(Number)
+    const [h2, m2] = time2.split(':').map(Number)
+
+    const date1 = new Date()
+    date1.setHours(h1, m1, 0, 0)
+
+    const date2 = new Date()
+    date2.setHours(h2, m2, 0, 0)
+
+    return date1 - date2
+  }
+
+  const save = () => {
+    if (!canSubmit.value) {
+      return
+    }
+    if (startDate.value > endDate.value) {
+      uni.showToast({
+        title: '失效日期需晚于生效日期',
+        icon: 'none'
+      })
+      return
+    }
+    if (compareTime(startTimeText.value, endTimeText.value) >= 0) {
+      uni.showToast({
+        title: '失效时间需晚于生效时间',
+        icon: 'none'
+      })
+      return
+    }
+    const data = {
+      startDate: updateTime(startDate.value, startTimeText.value),
+      endDate: updateTime(endDate.value, endTimeText.value),
+      weekDays: weekDays.value.sort()
+    }
+    uni.navigateBack({
+      success() {
+        eventChannel.emit('change', data)
+      }
+    })
+  }
+
+  const updateTime = (datetime, timeStr) => {
+    const date = new Date(datetime)
+    const [hours, minutes] = timeStr.split(':').map(Number)
+    date.setHours(hours, minutes, 0, 0) // 设置小时、分钟，秒和毫秒归零
+    return date.getTime()
+  }
+
+  const confirmDate = (type, date) => {
+    if (type === 'start') {
+      startDate.value = date.value
+      showStartDate.value = false
+    } else {
+      endDate.value = date.value
+      showEndDate.value = false
+    }
+  }
+
+  const confirmTime = (type, date) => {
+    if (type === 'start') {
+      startTimeText.value = date.value
+      showStartTime.value = false
+    } else {
+      endTimeText.value = date.value
+      showEndTime.value = false
+    }
+  }
+</script>
+
+<style lang="scss">
+  page {
+    background-color: $uni-bg-color-grey;
+  }
+</style>

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
   }
 ]
 

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)