From 36e780d61592da6b7a3201c1f628cc82bbdf9be7 Mon Sep 17 00:00:00 2001
From: "471615499@qq.com" <sy996996@>
Date: Wed, 2 Oct 2024 19:54:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DIOS=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/meetingRoom/meetingBooked/meetingBooked.js      | 6 ++++++
 miniprogram/pages/meeting/meetingRoom/meetingRoom.js        | 2 ++
 2 files changed, 8 insertions(+)

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')