111

components/selectArea/selectArea.acss

@@ -9,6 +9,7 @@
   background: rgba(0,0,0,.1);
   display: flex;
   align-items: flex-end;
+  z-index: 999;
 }
 .lableTreeContent{
   width: 100%;

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -59,8 +59,8 @@ create.Page({
     var h = date.getHours()
     var min = date.getMinutes();
     this.setData({
-      time1: `${y}/${m}/${d} ${h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 30 ? '00' : '30'}:00`,
-      time2: `${y}/${m}/${d} ${min < 30 ? h < 10 ? "0" + date.getHours() : date.getHours() : (h + 1) < 10 ? "0" + (date.getHours() + 1) : date.getHours() + 1}:${min < 30 ? '30' : '00'}:00`,
+      time1: `${y}/${m}/${d} ${h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 30 ? '30' : '00'}:00`,
+      time2: `${y}/${m}/${d} ${min < 30 ? (h + 1) < 10 ? "0" + (date.getHours() + 1) : date.getHours() + 1 : h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 30 ? '00' : '30'}:00`,
       week1: w,
       week2: w,
       type: event.type,

pages/meetingRoomList/meetingRoomList.acss

@@ -7,6 +7,7 @@
   position: fixed;
   left: 0;
   top: 0;
+  z-index: 99;
 }
 .searchHeader1 {
   border-bottom: 1px solid rgba(25,31,37,0.12);
@@ -139,6 +140,9 @@
   border-right: 1px solid #ffffff;
   box-sizing: border-box;
 }
+.reserveRoomTimeBarBg>view:nth-last-of-type(1){
+  border: none !important;
+}
 .preemption {
   background: #FFFFFF;
 }