fix：选择会议室后把时间赋值会议详情

pages/createMeeting/createMeeting.js

@@ -196,7 +196,7 @@ create.Page({
       location: {
         longitude: '10',
         latitude: '10',
-        locationName: this.$store.data.locationName
+        meetingRoomName: this.$store.data.locationName
       },
       startTime: this.$store.data.startTime.replace(/\//g, "-"),
       endTime: this.$store.data.endTime.replace(/\//g, "-"),

pages/meetingDetail/meetingDetail.js

@@ -103,6 +103,14 @@ create.Page({
       }
       this.update()
     }
+    if (this.$store.data.shouldUpdateShowTime) {
+      this.setData({
+        showTime: getShowTime(this.$store.data.startTime, this.$store.data.endTime)
+      })
+      this.$store.data.shouldUpdateShowTime = false;
+      this.update();
+    }
+
   },
   onLoad(event) {
     console.log('onload')
@@ -312,7 +320,7 @@ create.Page({
       location: {
         longitude: '-999',
         latitude: '-999',
-        locationName: this.$store.data.locationName
+        meetingRoomName: this.$store.data.locationName
       },
       meetingRoomId: !!this.$store.data.roomId ? this.$store.data.roomId : -1
     }
@@ -1388,8 +1396,12 @@ create.Page({
 
 
 export function fixSeperateIndex(index, list) {
+
   let separate = index;
+  if (list.length == 0) {
+    return -1;
 
+  }
   if (separate === list.length - 1) {
     separate = -1;
   }

pages/meetingRoomList/meetingRoomList.axml

@@ -54,10 +54,9 @@
   </view>
 </scroll-view>
 <popup show="{{isShowModal}}" onClose="onCancel" position="bottom">
+  <view onTap="onDetermine" class="picker-complete">完成</view>
   <view a:if="{{!isShowCalendar}}" class="modalContent">
-    <view class="modalHeader">
-      <text onTap="onDetermine">确定</text>
-    </view>
+    <!--<view class="modalHeader"><text onTap="onDetermine">确定</text></view> -->
     <view class="modalTimeSlot">
       <text a:if="{{!modalFooter.startTime || !modalFooter.endTime}}">请选择会议时间</text>
       <text a:if="{{modalFooter.startTime && modalFooter.endTime}}">{{modalFooter.startTime}}至{{modalFooter.isOneDay ? modalFooter.endTime.substr(11,16):modalFooter.endTime}} 共{{modalFooter.allMinutes}}分钟</text>

pages/meetingRoomList/meetingRoomList.js

@@ -1270,6 +1270,9 @@ create.Page({
         this.update();
       }
     }
+    // 通知详情页面是否需要重新计算时间
+    this.$store.data.shouldUpdateShowTime = true;
+    this.update();
     dd.navigateBack({
       delta: 2
     });

pages/place/place.js

@@ -100,7 +100,7 @@ create.Page({
         location: {
           longitude: -999,
           latitude: -999,
-          locationName: this.$store.data.locationName
+          meetingRoomName: this.$store.data.locationName
         },
         meetingRoomId: this.$store.data.roomId,
         modifyModel: this.data.conSelectPopupData.selectPopupId,