diff --git a/constant/keyType.js b/constant/keyType.js index 3a681ed..0cfddda 100644 --- a/constant/keyType.js +++ b/constant/keyType.js @@ -21,10 +21,10 @@ export const keysType = { }, 6: { name: '掌静脉', - icon: 'https://oss-lock.xhjcn.ltd/mp/icon_palm_vein_white.png' + icon: 'https://oss-lock.xhjcn.ltd/mp/icon_palm_vein_1.png' }, 7: { name: '遥控', - icon: 'https://oss-lock.xhjcn.ltd/mp/icon_remote_white.png' + icon: 'https://oss-lock.xhjcn.ltd/mp/icon_remote_1.png' } } diff --git a/pages/setting/lockUser.vue b/pages/setting/lockUser.vue index 6e1e683..536c923 100644 --- a/pages/setting/lockUser.vue +++ b/pages/setting/lockUser.vue @@ -267,6 +267,52 @@ } } } + if (data[i].openLockType === 6) { + for (let j = 0; j < data[i].keys.length; j++) { + data[i].keys[j].openLockType = data[i].openLockType + data[i].keys[j].name = data[i].keys[j].palmVeinName + data[i].keys[j].id = data[i].keys[j].palmVeinId + if (data[i].keys[j].palmVeinType === 1) { + data[i].keys[j].timeText = + timeFormat(data[i].keys[j].createDate, 'yyyy-mm-dd hh:MM') + ' 永久' + } else if (data[i].keys[j].palmVeinType === 2) { + data[i].keys[j].timeText = + timeFormat(data[i].keys[j].startDate, 'yyyy-mm-dd hh:MM') + + ' - ' + + timeFormat(data[i].keys[j].endDate, 'yyyy-mm-dd hh:MM') + + ' 限时' + } else { + data[i].keys[j].timeText = + timeFormat(data[i].keys[j].startDate, 'yyyy-mm-dd') + + ' - ' + + timeFormat(data[i].keys[j].endDate, 'yyyy-mm-dd') + + ' 循环' + } + } + } + if (data[i].openLockType === 7) { + for (let j = 0; j < data[i].keys.length; j++) { + data[i].keys[j].openLockType = data[i].openLockType + data[i].keys[j].name = data[i].keys[j].remoteName + data[i].keys[j].id = data[i].keys[j].remoteId + if (data[i].keys[j].remoteType === 1) { + data[i].keys[j].timeText = + timeFormat(data[i].keys[j].createDate, 'yyyy-mm-dd hh:MM') + ' 永久' + } else if (data[i].keys[j].remoteType === 2) { + data[i].keys[j].timeText = + timeFormat(data[i].keys[j].startDate, 'yyyy-mm-dd hh:MM') + + ' - ' + + timeFormat(data[i].keys[j].endDate, 'yyyy-mm-dd hh:MM') + + ' 限时' + } else { + data[i].keys[j].timeText = + timeFormat(data[i].keys[j].startDate, 'yyyy-mm-dd') + + ' - ' + + timeFormat(data[i].keys[j].endDate, 'yyyy-mm-dd') + + ' 循环' + } + } + } result.push(...data[i].keys) } console.log(result)