今天 明天 后天 修改

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -177,7 +177,8 @@ create.Page({
           })
         }
       } else {
-        if (new Date(timeStr).getTime() <= new Date(this.data.time1).getTime()) {
+        if (new Date(timeStr).getTime() < new Date(this.data.time1).getTime() || (new Date(timeStr).getTime() == new Date(this.data.time1).getTime())) {
+          
           dd.alert({
             title: '提示',
             content: '会议结束时间不能小于等于开始时间',

pages/index/index.axml

 <!--<mw-select></mw-select> -->
-版本号：128版
+版本号：142 调试版本版
 <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}}">
@@ -31,7 +31,7 @@
                                 <text>{{item.value.day}}</text>
                             </view>
                             <view class="dataSchedule">
-                                <view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="{{!isClicked?'nextDetail':''}}">
+                                <view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="nextDetail">
                                     <view class="dataScheduleName">
                                         <text>{{item2.title}}{{item2.isfirstDayOrEndDay ? `（第${item2.isFewDays}天，共${item2.duration}天）` : '' }}</text>
                                     </view>
@@ -55,7 +55,7 @@
                             </view>
                             <view class="dataSchedule">
                                 <!-- <view class="thisDayLine thisDayHavaMeeting" style="margin-bottom: 7.5rpx"></view> -->
-                                <view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="{{!isClicked?'nextDetail':''}}">
+                                <view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="nextDetail">
                                     <view class="dataScheduleName">
                                         <text>{{item2.title}}{{item2.isfirstDayOrEndDay ? `（第${item2.isFewDays}天，共${item2.duration}天）` : '' }}</text>
                                     </view>
@@ -80,7 +80,7 @@
                             <view class="NoSchedule">
                                 <view>
                                     <text>暂无日程安排，</text>
-                                    <text onTap="{{!isClicked?'nextPage':''}}">创建日程</text>
+                                    <text onTap="nextPage">创建日程</text>
                                 </view>
                                 <!-- <view class="thisDayLine"></view> -->
                             </view>

pages/index/index.js

@@ -8,7 +8,7 @@ Page({
     thisYear: '',
     maxYear: '',
     minYear: '',
-    isClicked: false,
+    // isClicked: false,
     startPageOnLoad: false,
     startPageOnShow: false,
     isFirstLoad: true
@@ -284,17 +284,19 @@ Page({
       path: 'pages/index/index',
     };
   },
-  // nextPage() {
+  nextPage() {
     // isClicked(this)
-  //   dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' })
-  // },
+    dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' })
+  },
   nextDetail: throttle(function (e) {
+     console.log(11111111)
     let item = e.target.dataset.item
     dd.navigateTo({ url: `./../scheduleDetail/scheduleDetail?scheduleItem=${JSON.stringify(item)}` })
   }, 1000),
-  nextPage: throttle(function (e) {
-    dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' })
-  }, 1000),
+  // nextPage: throttle(function (e) {
+  //   console.log(11111111)
+  //   dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' })
+  // }, 1000),
   lower() {
     let year = this.data.maxYear + 1
     let DateList = this.returnScheduleList(year)

pages/meetingRoomList/meetingRoomList.axml

@@ -91,9 +91,9 @@
       </view>
     </view>
     <view class="changeDay">
-      <view class="{{dataNum == '0' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="0">今天</view>
-      <view class="{{dataNum == '1' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="1">明天</view>
-      <view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2">后天</view>
+      <view class="{{dataNum == '0' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="0">{{search.time.replace(/-/g,".")}}</view>
+      <view class="{{dataNum == '1' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="1">{{tomorrowTime}}</view>
+      <view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2">{{afterTomorrowTime}}</view>
       <!-- <view onTap="selectDate">自定义</view> -->
     </view>
     <scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot" onScroll="modalScroll" scroll-into-view="{{toThisTime}}">

pages/scheduleDetail/scheduleDetail.axml

+
 <block a:if="{{showPage}}">
   <view class="scheduleDetail" onTap="hideModel">
     <view class="scheduleInfo">

pages/scheduleDetail/scheduleDetail.js

@@ -31,21 +31,26 @@ create.Page({
     showList: false,
     showItem: [],
     type: '',
-    mrReserveStatus: ''
+    mrReserveStatus: '',
+    id1: '',
+    planDate1: '',
+    scheduleTemplateId1: ''
   },
   onLoad(event) {
-    let scheduleItem = JSON.parse(event.scheduleItem)
+    let scheduleItem = {}
+    if (!!event.scheduleItem) {
+      scheduleItem = JSON.parse(event.scheduleItem)
+    } else {
+      scheduleItem = JSON.parse(Object.keys(event)[0].split('=')[1])
+    }
     this.setData({
       scheduleItem: scheduleItem,
       pemissions: getApp().globalData.userid
     })
   },
   onShow() {
-    // this.setData({
-    //   meetingLogId: ''
-    // })
     let data = {
-      id: this.data.scheduleItem.id,
+      id: this.data.scheduleItem.id ,
       planDate: this.data.scheduleItem.planDate,
       templateId: this.data.scheduleItem.scheduleTemplateId
     }
@@ -58,7 +63,7 @@ create.Page({
         }
       })
       this.setData({
-        mrReserveStatus:res.data.data.mrReserveStatus,
+        mrReserveStatus: res.data.data.mrReserveStatus,
         title: res.data.data.title,
         isRepeatable: res.data.data.repeatable,
         location: res.data.data.location,

utils/utils.js

 //防止多次重复点击  （函数节流）
 export function throttle(fn, gapTime) {
+    console.log(222222,123)
     if (gapTime == null || gapTime == undefined) {
         gapTime = 1500
     }