diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js index 0ff3717..c6dbd04 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js @@ -160,6 +160,12 @@ Page({ Notify('结束时间不能小于开始时间!') return } + // 判断开始时间是否已经超过了当前时间 + let nowDate = new Date().getTime() + if (nowDate > startTime) { + Notify('开始时间请大于当前时间!') + return + } if (act == 'use') { // 提前占用 console.log('占用!') diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.js b/miniprogram/pages/meeting/meetingRoom/meetingRoom.js index f6ebad8..7f1bbed 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.js @@ -68,9 +68,11 @@ Page({ for (let key in recordList) { let eachObj = recordList[key] let sTime = eachObj['start'] + sTime = sTime.replaceAll('-', '/') let sTimeStr = new Date(sTime).getTime() let sTimeData = new Date(sTimeStr) let eTime = eachObj['end'] + eTime = eTime.replaceAll('-', '/') let eTimeStr = new Date(eTime).getTime() let eTimeData = new Date(eTimeStr) let sTimeFormat = sTimeData.getHours().toString().padStart(2, '0') + ':' + sTimeData.getMinutes().toString().padStart(2, '0')