修改popup禁用滚动，会议室列表样式

components/popup/index.axml

-<view class="dm-popup {{show ? 'dm-popup-show' : ''}} {{ animation ? 'animation': '' }}" disable-scroll="{{disableScroll}}">
+<view class="dm-popup {{show ? 'dm-popup-show' : ''}} {{ animation ? 'animation': '' }}">
   <view class="dm-popup-mask" a:if="{{mask}}" onTap="onMaskTap" style="z-index: {{zIndex}}"></view>
   <view class="dm-popup-content {{className}} dm-popup-{{position}}" style="z-index: {{zIndex}}">
     <view a:if="{{position == 'bottom'}}" class="close-icon">

components/popup/index.js

@@ -7,7 +7,6 @@ Component({
     position: 'bottom',
     mask: true,
     animation: true,
-    disableScroll: true,
     zIndex: 1000
   },
   methods: {

pages/meetingRoomList/meetingRoomList.acss

@@ -132,7 +132,10 @@
   background: rgba(10, 10, 10, 0.2) !important;
   border: 1rpx solid rgba(27, 38, 61, 0.1) !important;
 }
-
+.myOccupied {
+  background: rgba(234, 12, 40, 1) !important;
+  border: 1rpx solid rgba(27, 38, 61, 0.1) !important;
+}
 .myReservation {
   background: rgba(234, 12, 40, 1);
   border: 1rpx solid rgba(27, 38, 61, 0.1);
@@ -217,12 +220,6 @@
   width: 750rpx;
 }
 
-.modalOccupyTimeSlot>view {
-  height: 80rpx;
-  width: 100%;
-  padding-left: 32rpx;
-}
-
 .OccupyTimeList {
   height: 100rpx;
   width: 100%;

pages/meetingRoomList/meetingRoomList.axml

@@ -4,7 +4,7 @@
     <view class="iconfont iconicon_open"></view>
   </view>
 </view>
-<view class="roomScrollView">
+<view class="roomScrollView" style="{{canScroll ? '': 'overflow:hidden'}}"">
   <view class="reserveMeeting">
     <view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime">
       <view class="roomMessage">
@@ -28,7 +28,9 @@
           <block a:for="{{item.timeSlotWithMeetingVOS}}" a:for-item="item2" a:for-index="index2">
             <view class="expired" a:if="{{item2.reserveStatus === 'expired'}}">
             </view>
-            <view class="occupied" a:if="{{item2.reserveStatus === 'occupied'}}">
+            <view class="occupied" a:if="{{item2.reserveStatus === 'occupied' && item2.scheduleList[0].organizer !== userId}}">
+            </view>
+            <view class="myOccupied" a:if="{{item2.reserveStatus === 'occupied' && item2.scheduleList[0].organizer === userId}}">
             </view>
             <view class="reservation" a:if="{{item2.reserveStatus === 'reservation'}}">
             </view>

pages/meetingRoomList/meetingRoomList.js

@@ -70,7 +70,8 @@ create.Page({
       tomorrowTime: "",
       afterTomorrowTime: "",
       customTime: ""
-    }
+    },
+    userId: ""
   },
   onLoad(query) {
     // let date = new Date(this.$store.data.startTime.replace(/-/g, "/"));
@@ -95,7 +96,8 @@ create.Page({
       )}/${padZero(tomorrowTime.getDate())}`,
       "TimeSlot.afterTomorrowTime": `${year}/${padZero(
         afterTomorrowTime.getMonth() + 1
-      )}/${padZero(afterTomorrowTime.getDate())}`
+      )}/${padZero(afterTomorrowTime.getDate())}`,
+      userId: getApp().globalData.userid
     });
     this.getPageData();
   },