从工作通知进入

app.json

 {
   "pages": [
     "pages/index/index",
+    "pages/hhh/hhh",
     "pages/uploadFile/uploadFile",
     "pages/editFile/editFile",
     "pages/place/place",

pages/hhh/hhh.axml

+<view>
+  New Page
+</view>
\ No newline at end of file

pages/hhh/hhh.js

+Page({
+  data: {},
+  onLoad() {},
+});

pages/hhh/hhh.json

+{}
\ No newline at end of file

pages/index/index.axml

 <!--<mw-select></mw-select> -->
-版本号：143 版本
+版本号：151 版本 
 <view class="index">
     <view a:if="{{startPageOnLoad&&startPageOnShow}}">
         <scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" onScroll="onScroll" style="height: 100vh;" scroll-into-view="{{todayStr}}">

pages/meetingRoomList/meetingRoomList.acss

@@ -268,7 +268,7 @@
 
 .modalOccupyTimeSlot {
   height: 504rpx;
-  width: 100%;
+  width: 750rpx;
 }
 
 .modalOccupyTimeSlot>view {

pages/meetingRoomList/meetingRoomList.axml

@@ -97,7 +97,7 @@
       <!-- <view onTap="selectDate">自定义</view> -->
     </view>
     <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 class="OccupyTimeList" a:for="{{modalList}}"  data-index="{{index}}" onTap="onChangeModalTime" id="{{item.reserveStartTime.substr(11,15)}}">
         <!-- <view data-status="{{item.reserveStatus}}" data-index="{{index}}">
           <timecheckmodal
             startTime="{{meetingTime.startTime}}"

pages/meetingRoomList/meetingRoomList.js

@@ -41,7 +41,7 @@ create.Page({
       meetingRoomName: ''
     },
     canScroll: true,
-    toThisTime: '123',
+    toThisTime: '',
     tomorrowTime: '',
     afterTomorrowTime: ''
   },
@@ -176,18 +176,19 @@ create.Page({
           }
         }
       })
+
       that.setData({
         modalList: modalList,
         isShowModal: true,
-        toThisTime: `${modalHour}:${modalMins < 30 ? '30' : '00'}`,
-        canScroll: false
+        canScroll: false,
+         toThisTime: `${modalHour}:${modalMins < 30 ? '30' : '00'}`
       })
     })
   },
   modalScroll() {
-    this.setData({
-      toThisTime: '12312312'
-    })
+    // this.setData({
+    //   toThisTime: '12312312'
+    // })
   },
   // 修改弹框checkBox
   onChangeModalTime(e) {

pages/scheduleDetail/scheduleDetail.js

@@ -50,19 +50,21 @@ create.Page({
   },
   onShow() {
     let data = {
-      id: this.data.scheduleItem.id ,
+      id: this.data.scheduleItem.id,
       planDate: this.data.scheduleItem.planDate,
-      templateId: this.data.scheduleItem.scheduleTemplateId
+      templateId: !!this.data.scheduleItem.scheduleTemplateId ? this.data.scheduleItem.scheduleTemplateId : this.data.scheduleItem.templateId
     }
     getScheduleDetail(data).then(res => {
       res.data.data.userList.forEach((item, index) => {
         if (item.participator.userId == getApp().globalData.userid) {
           this.setData({
-            currentParStaus: item.confirmAttendance == null ? -1 : item.confirmAttendance
+            currentParStaus: item.confirmAttendance == null ? -1 : item.confirmAttendance,
+            pemissions: getApp().globalData.userid
           })
         }
       })
       this.setData({
+        'scheduleItem.scheduleTemplateId': res.data.data.scheduleTemplateId,
         mrReserveStatus: res.data.data.mrReserveStatus,
         title: res.data.data.title,
         isRepeatable: res.data.data.repeatable,