修改会议室周几失效

components/mwSelectTimeModal/mwSelectTimeModal.acss

@@ -10,7 +10,7 @@
     width: 100%;
     height: 100%;
     display: flex;
-    background: rgba(25, 31, 37, 0.4);
+    background: rgba(0, 0, 0, 0.15);
     flex-direction: column-reverse;
 }
 .mwModalBox{

components/selectArea/selectArea.acss

@@ -6,7 +6,7 @@
   top: 0;
   width: 100%;
   height: 100%;
-  background: rgba(0,0,0,.1);
+  background: rgba(0,0,0,.15);
   display: flex;
   align-items: flex-end;
   z-index: 999;

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -431,6 +431,7 @@ create.Page({
   },
   // 编辑时获取详情页内容
   getScheduleInfo() {
+    let that = this
     let data = {
       id: this.data.scheduleItem.id,
       planDate: this.data.scheduleItem.planDate,
@@ -462,8 +463,8 @@ create.Page({
         title: res.data.data.title,
         time1: res.data.data.startTime.replace(/-/g, '/'),
         time2: res.data.data.endTime.replace(/-/g, '/'),
-        week1: this.data.weekList[new Date(res.data.data.startTime.replace(/-/g, "/")).getDay()],
-        week2: this.data.weekList[new Date(res.data.data.endTime.replace(/-/g, "/")).getDay()],
+        week1: that.data.weekList[new Date(res.data.data.startTime.replace(/-/g, "/")).getDay()],
+        week2: that.data.weekList[new Date(res.data.data.endTime.replace(/-/g, "/")).getDay()],
       })
       this.update()
       setTimeout(() => {

pages/meetingRoomList/meetingRoomList.acss

@@ -177,7 +177,7 @@
   height: 100%;
   display: flex;
   align-items: flex-end;
-  background: rgba(0,0,0,.1)
+  background: rgba(0,0,0,.15);
 }
 .modalContent{
   width: 100%;

pages/meetingRoomList/meetingRoomList.axml

@@ -33,45 +33,43 @@
 </view>
 <scroll-view scroll-y="{{canScroll}}" class="roomScrollView">
   <view class="reserveMeeting">
-    <scroll-view scroll-y='{{true}}' scroll-into-view='searchList' class="reserveMeetingScrollView">
-      <view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime">
-        <view class="roomMessage">
-          <view class="reserveRoomMsg">
-            <view class="reserveRoomTitle">
-              {{item.name}}
-            </view>
-            <view class="reserveRoomEquipFacility">
-              <text class="locationIcon iconfont iconshebei"></text> <text a:for="{{item.equipFacilityNames}}" a:if="{{item2 !== null}}" a:for-item="item2" a:for-index="index2">{{item2}}{{index2 === item.equipFacilityNames.length-1 ? '' : '/'}}</text>
+    <view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime">
+      <view class="roomMessage">
+        <view class="reserveRoomMsg">
+          <view class="reserveRoomTitle">
+            {{item.name}}
+          </view>
+          <view class="reserveRoomEquipFacility">
+            <text class="locationIcon iconfont iconshebei"></text> <text a:for="{{item.equipFacilityNames}}" a:if="{{item2 !== null}}" a:for-item="item2" a:for-index="index2">{{item2}}{{index2 === item.equipFacilityNames.length-1 ? '' : '/'}}</text>
+          </view>
+          <view class="reserveRoomNumAndLocation">
+            <view class="reserveRoomNum">
+              <text class="locationIcon iconfont icondingwei1"></text>{{item.capacityNum}}
             </view>
-            <view class="reserveRoomNumAndLocation">
-              <view class="reserveRoomNum">
-                <text class="locationIcon iconfont icondingwei1"></text>{{item.capacityNum}}
-              </view>
-              <view class="reserveRoomLocation">
-                <text class="locationIcon iconfont iconcanhuiren"></text>{{item.locationName}}
-              </view>
+            <view class="reserveRoomLocation">
+              <text class="locationIcon iconfont iconcanhuiren"></text>{{item.locationName}}
             </view>
           </view>
         </view>
-        <view class="reserveRoomTimeBar">
-          <view class="reserveRoomTimeBarBg">
-            <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>
-              <view class="reservation" a:if="{{item2.reserveStatus === 'reservation'}}">
-              </view> 
-            </block>
-          </view>
-          <view class="reserveRoomTimeBarNum">
-            <view a:for="{{timeListStr}}" a:for-item="item2" a:for-index="index2">
-              {{item2}}
+      </view>
+      <view class="reserveRoomTimeBar">
+        <view class="reserveRoomTimeBarBg">
+          <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>
+            <view class="reservation" a:if="{{item2.reserveStatus === 'reservation'}}">
+            </view> 
+          </block>
+        </view>
+        <view class="reserveRoomTimeBarNum">
+          <view a:for="{{timeListStr}}" a:for-item="item2" a:for-index="index2">
+            {{item2}}
           </view>
         </view>
       </view>
-    </scroll-view>
+    </view>
   </view>
 </scroll-view>
 <view a:if="{{isShowModal}}" class="modal">
@@ -90,7 +88,7 @@
       <view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2">后天</view>
       <!-- <view onTap="selectDate">自定义</view> -->
     </view>
-    <scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot" onScroll="modalScroll" scroll-into-view="{{modalOccupyTimeSlotTime}}">
+    <scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot" onScroll="modalScroll" scroll-into-view="{{toThisTime}}">
       <view class="OccupyTimeList" a:for="{{modalList}}"  data-index="{{index}}" onTap="onChangeModalTime" id="{{item.reserveStartTime.substr(10,15)}}">
         <!-- <view data-status="{{item.reserveStatus}}" data-index="{{index}}">
           <timecheckmodal

pages/meetingRoomList/meetingRoomList.js

@@ -34,7 +34,7 @@ create.Page({
       meetingRoomName: ''
     },
     canScroll: true,
-    modalOccupyTimeSlotTime: '123'
+    toThisTime: '123'
   },
   onLoad(query) {
     let date = new Date(this.store.data.startTime.replace(/-/g, "/"))
@@ -156,14 +156,14 @@ create.Page({
       that.setData({
         modalList: modalList,
         isShowModal: true,
-        // modalOccupyTimeSlotTime: `${modalHour}:${modalMins<30? '30' : '00'}`
-        modalOccupyTimeSlotTime: '10:30'
+        toThisTime: `${modalHour}:${modalMins<30? '30' : '00'}`,
+        canScroll: false
       })
     })
   },
   modalScroll(){
     this.setData({
-      modalOccupyTimeSlotTime: '12312312'
+      toThisTime: '12312312'
     })
   },
   // 修改弹框checkBox
@@ -480,13 +480,13 @@ create.Page({
         that.setData({
           modalList: modalList2,
           dataNum: num,
-          modalOccupyTimeSlotTime: `${modalHour}:${modalMins<30? '30' : '00'}`
+          toThisTime: `${modalHour}:${modalMins<30? '30' : '00'}`
         })
       } else {
         that.setData({
           modalList: modalList,
           dataNum: num,
-          modalOccupyTimeSlotTime: `${modalHour}:${modalMins<30? '30' : '00'}`
+          toThisTime: `${modalHour}:${modalMins<30? '30' : '00'}`
         })
       }
     })
@@ -501,7 +501,8 @@ create.Page({
         date: '',
         meetingRoomId: ''
       },
-      dataNum: 0
+      dataNum: 0,
+      canScroll: true
     })
   },
   onDetermine(){