From 375a338cd2db3e3c75bdaec017f6bd5b98b2c68e Mon Sep 17 00:00:00 2001 From: fanpeng <438123081@qq.com> Date: Tue, 8 Jul 2025 12:01:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E9=94=81=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=9B=BE=E6=A0=87=E5=92=8C=E9=94=81=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=8E=8C=E9=9D=99=E8=84=89=E5=92=8C=E9=81=A5=E6=8E=A7=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E6=97=B6=E9=97=B4=E6=96=87=E6=9C=AC=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constant/keyType.js | 4 ++-- pages/setting/lockUser.vue | 46 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) 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)