liyi/wx-starlock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fanpeng' into 'develop'

Browse Source 
修复开锁未生成对应开锁记录的bug

See merge request StarlockTeam/wx-starlock!19
This commit is contained in:
范鹏 2025-02-13 08:56:47 +00:00
commit da2443da7a
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pages/bindCard/bindCard.vue
View File

@ -56,6 +56,7 @@
endDate: params.endDate, endDate: params.endDate,
cardName: params.cardName, cardName: params.cardName,
cardNumber: String(data.cardNumber), cardNumber: String(data.cardNumber),
cardUserNo: String(data.cardNumber),
cardType: params.cardType, cardType: params.cardType,
addType: 1, addType: 1,
weekDay: params.weekDays, weekDay: params.weekDays,

1
pages/bindRemote/bindRemote.vue
View File

@ -56,6 +56,7 @@
endDate: params.endDate, endDate: params.endDate,
remoteName: params.remoteName, remoteName: params.remoteName,
remoteNumber: String(data.remoteNumber), remoteNumber: String(data.remoteNumber),
remoteUserNo: String(data.remoteNumber),
remoteType: params.remoteType, remoteType: params.remoteType,
addType: 1, addType: 1,
weekDay: params.weekDays, weekDay: params.weekDays,

2
pages/createPassword/createPassword.vue
View File

@ -156,7 +156,7 @@
if (type === 'temporary') { if (type === 'temporary') {
params.keyboardPwdName = this.temporaryName params.keyboardPwdName = this.temporaryName
params.keyboardPwdType = 3 params.keyboardPwdType = 3
params.startDate = new Date().getTime() params.startDate = new Date().setHours(0, 0, 0, 0)
params.endDate = this.temporaryTime params.endDate = this.temporaryTime
params.hoursStart = 0 params.hoursStart = 0
params.hoursEnd = 0 params.hoursEnd = 0

4
pages/searchDevice/searchDevice.vue
View File

@ -119,10 +119,10 @@
return return
} }
const date = new Date() const date = new Date()
const timestamp = parseInt(date.getTime() / 1000, 10) - date.getTimezoneOffset() * 60 const timestamp = this.serverTimestamp - date.getTimezoneOffset() * 60
const { code } = await this.getLockStatus({ const { code } = await this.getLockStatus({
name: this.currentLockInfo.name, name: this.currentLockInfo.name,
uid: this.userInfo.uid, uid: this.userInfo.uid.toString(),
nowTime: this.serverTimestamp, nowTime: this.serverTimestamp,
localTime: timestamp localTime: timestamp
}) })