Merge branch 'master' of http://gitlab.roboming.com/fengzhaoyu/schedule

app.json

 {
   "pages": [
     "pages/index/index",
-        "pages/meetingRoomList/meetingRoomList",
     "pages/uploadFile/uploadFile",
     "pages/repetitionTime/repetitionTime",
     "pages/createOrEditSchedule/createOrEditSchedule",
@@ -12,6 +11,8 @@
     "pages/scheduleDetail/scheduleDetail",
     "pages/place/place",
     "pages/participantsDetail/participantsDetail",
-        "pages/editFile/editFile"  
+    "pages/editFile/editFile",
+    "pages/meetingRoomList/meetingRoomList",
+    "pages/createOrEditSchedule/createOrEditSchedule"
   ]
 }

pages/index/index.axml

 <!-- <mw-select></mw-select> -->
-版本号：90版
+版本号：94版
 <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/scheduleDetail/scheduleDetail.axml

 <view class="scheduleDetail">
+{{startTime}}
   <view class="scheduleInfo">
     <!-- 标题 -->
     <view class="title">
@@ -23,13 +24,13 @@
       <view class="text" a:if="{{isAcrossDay}}">
         <view>
           {{`
-            ${startTime.substring(5, 7)}月${startTime.substring(8, 10)}日 ${startTime.substring(11, 16)} 至
-            ${endTime.substring(5, 7)}月${endTime.substring(8, 10)}日 ${endTime.substring(11, 16)}
+            ${time1.substring(5, 7)}月${time1.substring(8, 10)}日 ${time1.substring(11, 16)} 至
+            ${time2.substring(5, 7)}月${time2.substring(8, 10)}日 ${time2.substring(11, 16)}
           `}}
         </view>
       </view>
       <view class="text" a:else>
-        {{`${startTime.substring(5, 7)}月${startTime.substring(8, 10)}日 ${week} ${startTime.substring(11, 16)}-${endTime.substring(11, 16)}`}}
+        {{`${time1.substring(5, 7)}月${time1.substring(8, 10)}日 ${week} ${time1.substring(11, 16)}-${time2.substring(11, 16)}`}}
       </view>
     </view>
   </view>
@@ -100,7 +101,7 @@
       <view class="dynamicright">
         <view class="dynamicMinutes">
           <text>{{item.username}}</text>
-          <text>5分钟前</text>
+          <text>{{item.time}}</text>
         </view>
         <view class="describe" a:if="{{!!item.descript}}">
           {{item.descript}}

pages/scheduleDetail/scheduleDetail.js

@@ -7,8 +7,8 @@ create.Page({
   data: {
     title: '',
     location: '',
-    startTime: '',
-    endTime: '',
+    time1: '',
+    time2: '',
     weeks: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
     week: '',
     isAcrossDay: true,
@@ -46,8 +46,8 @@ create.Page({
       this.setData({
         title: res.data.data.title,
         location: res.data.data.location,
-        startTime: res.data.data.startTime,
-        endTime: res.data.data.endTime,
+        time1: res.data.data.startTime,
+        time2: res.data.data.endTime,
         organizer: res.data.data.organizer,
         week: this.data.weeks[new Date(res.data.data.startTime).getDay() - 1]
       })
@@ -109,6 +109,9 @@ create.Page({
       space: { spaceId: _that.data.uploadSpaceId, compress: true, isCopy: 1, max: 9 },
       types: ["photo", "camera", "space"],
       success: (res) => {
+        console.log(111111)
+        console.log(JSON.stringify(res))
+        console.log(2222)
         dd.navigateTo({ url: `./../uploadFile/uploadFile?scheduleItem=${JSON.stringify(_that.data.scheduleItem)}&upLoadInfo=${JSON.stringify(res)}` })
       },
       fail: (err) => {
@@ -181,6 +184,7 @@ create.Page({
       if (!!res.data.data) {
         res.data.data.forEach((item, index) => {
           if (!!item.scheduleAccessory) {
+            item.scheduleAccessory.time = this.dealFileTime(item.createTime)
             item.scheduleAccessory.fileInfos = JSON.parse(item.scheduleAccessory.fileInfos)
             item.scheduleAccessory.uploaderInfo = JSON.parse(item.scheduleAccessory.uploaderInfo)
             allFileInfo.push(item.scheduleAccessory)
@@ -218,5 +222,20 @@ create.Page({
         dd.navigateTo({ url: `./../editFile/editFile?file=${JSON.stringify(event.target.dataset.file)}` })
         break;
     }
+  },
+  // 判断是刚刚 五分钟以内 十分钟以内 正常时间年月日
+  dealFileTime(creatTime) {
+    let nowTime = new Date().getTime()
+    let time = new Date(creatTime).getTime()
+    let timeResule = ''
+    if ((nowTime - time) / 1000 < 60) {
+      timeResule = '刚刚'
+    } else if((nowTime - time) / 1000 < 60*5 || (nowTime - time) / 1000==60 ){
+      timeResule = '5分钟以内'
+    } else {
+      timeResule = creatTime.substring(0, 16)
+    }
+    return timeResule
+
   }
 });