11

app.json

@@ -2,7 +2,6 @@
   "pages": [
     "pages/index/index",
     "pages/editFile/editFile",
-    "pages/createOrEditSchedule/createOrEditSchedule",
     "pages/meetingRoomList/meetingRoomList",
     "pages/place/place",
     "pages/uploadFile/uploadFile",

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -68,8 +68,8 @@ create.Page({
     let date2 = new Date(DateTimeStr);
     date2.setMinutes(date2.getMinutes() + 30)
     this.setData({
-      time1: `${date1.getFullYear()}/${date1.getMonth() < 9 ? '0'+(date1.getMonth()+1):date1.getMonth()+1}/${date1.getDate() < 10 ? "0" + date1.getDate() : date1.getDate()} ${date1.getHours() < 10 ? '0' + date1.getHours() : date1.getHours()}:${date1.getMinutes()<10? '0'+date1.getMinutes():date1.getMinutes()}`,
-      time2: `${date2.getFullYear()}/${date2.getMonth() < 9 ? '0'+(date2.getMonth()+1):date2.getMonth()+1}/${date2.getDate() < 10 ? "0" + date2.getDate() : date2.getDate()} ${date2.getHours() < 10 ? '0' + date2.getHours() : date2.getHours()}:${date2.getMinutes()<10? '0'+date2.getMinutes():date2.getMinutes()}`,
+      time1: `${date1.getFullYear()}/${date1.getMonth() < 9 ? '0'+(date1.getMonth()+1):date1.getMonth()+1}/${date1.getDate() < 10 ? "0" + date1.getDate() : date1.getDate()} ${date1.getHours() < 10 ? '0' + date1.getHours() : date1.getHours()}:${date1.getMinutes()<10? '0'+date1.getMinutes():date1.getMinutes()}:00`,
+      time2: `${date2.getFullYear()}/${date2.getMonth() < 9 ? '0'+(date2.getMonth()+1):date2.getMonth()+1}/${date2.getDate() < 10 ? "0" + date2.getDate() : date2.getDate()} ${date2.getHours() < 10 ? '0' + date2.getHours() : date2.getHours()}:${date2.getMinutes()<10? '0'+date2.getMinutes():date2.getMinutes()}:00`,
       week1: w,
       week2: w,
       type: event.type,

pages/index/index.axml

 <!--<mw-select></mw-select> -->
-版本号：119版
+版本号：121版
 <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.js

@@ -44,8 +44,8 @@ create.Page({
     toThisTime: '123'
   },
   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()}`

pages/scheduleDetail/scheduleDetail.axml

@@ -106,7 +106,6 @@
             {{item2.fileType}}
               <view class="fileImage {{item2.fileType==('png' || 'jpg' || 'svg' || 'jpeg') ?'image': item2.fileType}}"></view>
               <view class="fileName">
-                {{item2.fileName}}
               </view>
             </view>
             <view class="modFile" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}">