Commit 113c458d by liang ce

解决会议室跨天查询问题和过期时间判定

parent 72dfd681
...@@ -951,8 +951,8 @@ create.Page({ ...@@ -951,8 +951,8 @@ create.Page({
endTimeDate.setMinutes(endTimeDate.getMinutes() + 30); endTimeDate.setMinutes(endTimeDate.getMinutes() + 30);
let data = { let data = {
meetingRoomId: this.data.meetingTime.meetingRoomId, meetingRoomId: this.data.meetingTime.meetingRoomId,
startTime: `${startTime}:00`, endTime: `${startTime}:00`,
endTime: `${endTimeDate.getFullYear()}-${ startTime: `${endTimeDate.getFullYear()}-${
endTimeDate.getMonth() + 1 < 10 endTimeDate.getMonth() + 1 < 10
? "0" + (endTimeDate.getMonth() + 1) ? "0" + (endTimeDate.getMonth() + 1)
: endTimeDate.getMonth() + 1 : endTimeDate.getMonth() + 1
...@@ -1099,11 +1099,15 @@ create.Page({ ...@@ -1099,11 +1099,15 @@ create.Page({
startTime: meetingDate startTime: meetingDate
}; };
getReserveRoomList(data).then(res => { getReserveRoomList(data).then(res => {
const isExpired =
new Date().getTime() >
new Date(`${meetingDate.replace(/-/g, "/")} 23:59:59`);
let modalList = res.data.data[0].timeSlotWithMeetingVOS.map(item => { let modalList = res.data.data[0].timeSlotWithMeetingVOS.map(item => {
// 判断是否过期 // 判断是否过期
if ( if (
item.reserveStatus === "expired" || item.reserveStatus === "expired" ||
item.reserveStatus === "occupied" item.reserveStatus === "occupied" ||
isExpired
) { ) {
return { return {
...item, ...item,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment