邹能昇 3 месяцев назад
Родитель
Сommit
281c88a01b

+ 6 - 5
nova-tourism/pages/homestay/homestay-detail/index.js

@@ -234,17 +234,17 @@ Page({
     async checkOrderCount(roomId, start, end) {
         const startTime = new Date(start);
         const endTime = new Date(end);
-        let now = dateServ.changeDateTime(new Date(), '14:00:00')
+        let startTime2 = dateServ.changeDateTime(startTime, '14:00:00')
+        let endTime2 = dateServ.changeDateTime(endTime, '12:00:00')
         let Order = new Parse.Query("RoomOrder")
         Order.equalTo("room", roomId)
         Order.equalTo("company", company)
         Order.exists("status")
-        Order.notContainedIn('status', [100, 400, 601, 700])
-        Order.greaterThanOrEqualTo("startTime", endTime) //20  23    21 22  
-        Order.lessThanOrEqualTo("endTime", startTime)
+        Order.notContainedIn('status', [400, 601, 700,800])
+        Order.lessThan("startTime", endTime2);
+        Order.greaterThan("endTime", startTime2); 
         Order.select("startTime", "endTime")
         let count = await Order.count()
-        console.log(count);
         return count
     },
     //收藏功能
@@ -459,6 +459,7 @@ Page({
             })
             console.log(this.data.istoday);
         }
+        this.getroom()
         console.log(`入住日期: ${this.data.decodedDateStartart}, 离店日期: ${this.data.decodedDateEnd}, 天数差: ${daysBetween}天`);
     },
     //拨打电话

+ 9 - 6
nova-tourism/pages/homestay/homestay-order2/index.js

@@ -160,14 +160,15 @@ Page({
         //   start1 = start2              end1 = end2
         const startTime = new Date(this.data.startTime);
         const endTime = new Date(this.data.endTime);
-        let now = dateServ.changeDateTime(new Date(), '14:00:00')
+        const startTime2 = dateServ.changeDateTime(startTime, '14:00:00')
+        const endTime2 = dateServ.changeDateTime(endTime, '12:00:00')
         let Order = new Parse.Query("RoomOrder")
         Order.equalTo("room", this.data.roomId)
         Order.equalTo("company", company)
         Order.exists("status")
-        Order.notContainedIn('status', [100, 400, 601, 700])
-        Order.greaterThanOrEqualTo("startTime", endTime) //20  23    21 22  
-        Order.lessThanOrEqualTo("endTime", startTime)
+        Order.notContainedIn('status', [400, 601, 700,800])
+        Order.lessThan("startTime", endTime2);
+        Order.greaterThan("endTime", startTime2); 
         Order.select("startTime", "endTime")
         let count = await Order.count()
         console.log('count', count);
@@ -190,6 +191,8 @@ Page({
     async setOrder(tradeNo) {
         const startTime = new Date(this.data.startTime);
         const endTime = new Date(this.data.endTime);
+        const startTime2 = dateServ.changeDateTime(startTime, '14:00:00')
+        const endTime2 = dateServ.changeDateTime(endTime, '12:00:00')
         let currentUser = Parse.User.current()
         let Order = Parse.Object.extend("RoomOrder");
         let order = new Order()
@@ -207,8 +210,8 @@ Page({
                 objectId: this.data.roomId
             });
             console.log(this.data.startTime, endTime);
-            order.set("startTime", startTime);
-            order.set("endTime", endTime);
+            order.set("startTime", startTime2);
+            order.set("endTime", endTime2);
             order.set("merber", 1);
             order.set("price", this.data.count * this.data.room.price);
             order.set("shopStore", {