Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-tenant-frontend

src/views/room/fangtailive.vue

@@ -1020,7 +1020,14 @@ export default {
         clearTimeout(this.timeId);
       }
       if (!roomLive.livingData || !roomLive.livingData.livingOrder) {
-        this.handleCheckInAdd(roomLive);
+        if (!roomLive.bookingData || !roomLive.bookingData.bookingOrder) {
+          this.handleCheckInAdd(roomLive);
+        } else {
+          this.$router.push({
+            name: "room-scheduledetail",
+            params: { id: roomLive.bookingData.bookingOrder.bookingOrdersNo},
+          });
+        }
       } else {
         this.$refs.ModalBillRoomInfo.add(
           roomLive.livingData.livingOrder.bookingOrderId,