11

pages/index/index.axml

 <!-- <mw-select></mw-select> -->
-版本号：103版
+
+版本号：106版
 <scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" style="height: 100vh;" scroll-into-view="{{todayStr}}">
     <block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
         <block a:for="{{scheduleYearList}}">

pages/meetingRoomList/meetingRoomList.js

@@ -35,8 +35,8 @@ create.Page({
     }
   },
   onLoad(query) {
-    let date = new Date(this.store.data.startTime.replace(/-/g, "/"))
-    // let date = new Date()
+    // let date = new Date(this.store.data.startTime.replace(/-/g, "/"))
+    let date = new Date()
     let year = date.getFullYear()
     let month = `${date.getMonth() + 1}`
     let day = `${date.getDate()}`
@@ -385,7 +385,7 @@ create.Page({
           status: 'checked'
         }
       } else {
-        if (item.reserveStatus=== 'expired') {
+        if (item.reserveStatus=== 'expired' || item.reserveStatus=== 'occupied') {
           return {
             ...item,
             status: 'BeOverdue'

pages/place/place.acss

@@ -19,14 +19,14 @@ page {
     display: flex;
     padding: 38rpx 32rpx;
     border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
+    align-items: center;
 }
 
 .search input {
-    font-size: 40rpx;
+    font-size: 40rpx !important;
     width: 100%;
     padding-left: 0;
-    height: 40rpx;
-    line-height: 40rpx;
+    display: block;
 }
 
 .availableList {

pages/repetitionTime/repetitionTime.axml

@@ -7,7 +7,7 @@
   </view>
 </view>
 <view class="tip" a:if="{{isBeOverdue}}">
-  结束时间不能小于当前时间
+  结束时间不能小于会议截止时间
 </view>
 <view class="timeView">
   <view>

pages/repetitionTime/repetitionTime.js

@@ -12,7 +12,6 @@ create.Page({
     month: '',
     day: '',
     week: '',
-    isNeverStop: true,
     isBeOverdue: false,
   },
   onLoad() {
@@ -122,7 +121,7 @@ create.Page({
       timeDay.push(`${i}日 ${week}`)
     }
     let isBeOverdue;
-    if (date.getTime()< new Date().getTime()) {
+    if (date.getTime()< new Date(this.store.data.endTime.replace(/-/g, '/')).getTime()) {
       isBeOverdue = true
     } else {
       isBeOverdue = false
@@ -136,5 +135,7 @@ create.Page({
       isBeOverdue: isBeOverdue,
       pickerValue: [data[0],data[1],data[2]]
     })
+    this.store.data.recurrenceModel.forever = '0'
+    this.update()
   }
 });