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

app.json

 {
   "pages": [
     "pages/index/index",
+    "pages/aa/aa",
     "pages/meetingRoomList/meetingRoomList",
     "pages/bindingApp/bindingApp",
     "pages/meetingDetail/meetingDetail",
@@ -16,5 +17,6 @@
   ],
   "window": {
     "allowsBounceVertical": "YES"
-  }
+  },
+  "pullRefresh": false
 }
\ No newline at end of file

pages/aa/aa.axml

+<view>
+  <web-view id="web-view-1" src="https://us04web.zoom.us/j/73435684909?pwd=jaYcRdSfyjuCD1x-Jw8DU8AD3iWiTw" onMessage="test"></web-view></view>
\ No newline at end of file

pages/aa/aa.js

+import openLink from "dingtalk-jsapi/api/biz/util/openLink";
+
+Page({
+  data: {},
+  onLoad() {
+    // openLink({
+    //   url: 'https://us04web.zoom.us/j/73435684909?pwd=jaYcRdSfyjuCD1x-Jw8DU8AD3iWiTw'
+    // });
+  },
+});

pages/aa/aa.json

+{}
\ No newline at end of file

pages/createMeeting/createMeeting.json

 {
+    "pullRefresh": false,
     "usingComponents": {
         "popup": "../../components/popup/index",
         "list": "../../components/list/list",

pages/index/index.axml

@@ -92,7 +92,7 @@
                 <view class="scheduleTime">
                   <text a:if="{{item.value.isDaySpan && item.value.isfirstDayOrEndDay === '0'}}">{{item.value.thisDayStartTime}}</text>
                   <text a:elif="{{item.value.isDaySpan && item.value.isfirstDayOrEndDay === '1'}}">全天</text>
-                  <text a:elif="{{item.value.isDaySpan && item.value.isfirstDayOrEndDay === '2'}}">直到{{item.value.thisDayEndTime}}</text>
+                  <text a:elif="{{item.value.isDaySpan && item.value.isfirstDayOrEndDay === '2'}}">{{ item.value.thisDayEndTime == '00:00' ? '全天' : '直到'+item.value.thisDayEndTime }}</text>
                   <text a:else>{{item.value.thisDayStartTime}} - {{item.value.thisDayEndTime}}</text>
                 </view>
               </view>

pages/index/index.js

@@ -89,7 +89,7 @@ create.Page({
       this.setData({
         listLoading: false
       });
-      let scheduleItem = JSON.parse(Object.keys(event)[0].split("=")[1]);
+      const scheduleItem = JSON.parse(Object.keys(event)[0].split("=")[1]);
       dd.navigateTo({
         url: `./../meetingDetail/meetingDetail?scheduleItem=${encodeURIComponent(
           JSON.stringify(scheduleItem)
@@ -322,7 +322,7 @@ create.Page({
       pushItem.duration = nextDateList.length;
       for (let i = 1; i < nextDateList.length; i++) {
         if (DateMap.has(nextDateList[i])) {
-          DateMap.get(nextDateList[i]).unshift({
+          DateMap.get(nextDateList[i]).push({
             ...pushItem,
             isFewDays: i + 1,
             isfirstDayOrEndDay: nextDateList.length - 1 === i ? "2" : "1" // 0 第一天，1中间的天，2结束的天
@@ -782,7 +782,7 @@ create.Page({
     maxClickCount--;
     if (maxClickCount == 0) {
       dd.alert({
-        content: "版本号222"
+        content: "0.0.5"
       });
       maxClickCount = 5;
     }

pages/index/schedule.js

@@ -36,24 +36,20 @@ export function getExcludeDate(data = []) {
   };
 }
 
-// 返回跨天数
+// 返回跨天数组
 export function getNextDateList(startTime, endTime) {
   let days = 0;
   const nextDateList = [];
-  if (startTime.getDate() !== endTime.getDate()) {
-    //同一个月
-    if (startTime.getMonth() == endTime.getMonth()) {
-      days = endTime.getDate() - startTime.getDate();
-    }
-    //跨月
-    else {
-      // 一个月份有多少天new Date(year, month, 0).getDate()
-      const startMonth = new Date(startTime.getFullYear(), startTime.getMonth(), 0).getDate();
-      days = startMonth - startTime.getDate() + endTime.getDate()
-    }
-  } else {
-    //跨一个月 不考虑
+
+  //去掉时分
+  const firstDate = new Date(startTime.toLocaleDateString());
+  const secondDate = new Date(endTime.toLocaleDateString());
+  days = parseInt(Math.abs(firstDate.getTime() - secondDate.getTime()) / (1000 * 60 * 60 * 24));
+
+  if (endTime.getHours() == 0 && endTime.getMinutes() == 0) {
+    days -= 1;
   }
+
   //返回跨天的日期数组
   for (let i = 0; i <= days; i++) {
     const newDate = new Date(startTime);

pages/meetingDetail/meetingDetail.acss

@@ -415,6 +415,7 @@ input {
 
 .remindTimeContaint {
     display: inline-block;
+    flex-wrap: nowrap;
     max-width: 400rpx;
     overflow: scroll;
     white-space: nowrap;
@@ -607,4 +608,8 @@ input {
 
 .addPadding {
     padding-bottom: 270rpx;
+}
+
+.lineThrough {
+    text-decoration: line-through;
 }
\ No newline at end of file

pages/meetingDetail/meetingDetail.axml

@@ -45,7 +45,7 @@
             <view class="noPlace" a:if="{{!$data.locationName}}" onTap="nextPage" data-nextPage="location">
                 添加地点
             </view>
-            <view class="hasplace" onTap="nextPage" data-nextPage="location" a:else>
+            <view class="hasplace {{mrReserveStatus === 'N' ? 'lineThrough' : ''}} " onTap="nextPage" data-nextPage="location" a:else>
                 {{$data.locationName}}
             </view>
             <view class=" icon iconfont iconicon_close close" a:if="{{!!$data.locationName&&(currentPeople == organizer)}}" data-close="location" catchTap="close">

pages/meetingDetail/meetingDetail.js

@@ -106,7 +106,8 @@ create.Page({
     editType: '',
     confirmAttendance: null,
     isExpand: false,
-    placeholder: ''
+    placeholder: '',
+    mrReserveStatus: ''
   },
   onShow() {
     // this.conflictPeople()
@@ -227,6 +228,7 @@ create.Page({
           }
         }
         this.setData({
+          mrReserveStatus: res.data.data.mrReserveStatus,
           confirmAttendance: res.data.data.confirmAttendance === null ? -9 : res.data.data.confirmAttendance,
           organizer: res.data.data.organizer,
           'comListData.meetingWayModelId': res.data.data.meetingWayModel.model === null ? null : (res.data.data.meetingWayModel.model === 'dingtalk' ? 1 : 0),

pages/meetingDetail/meetingDetail.json

 {
+    "pullRefresh": false,
     "usingComponents": {
         "popup": "../../components/popup/index",
         "task-list": "../../components/taskList/taskList",

pages/meetingRoomList/meetingRoomList.axml

 <view class="searchHeader">
   <view class="searchTime">
     <view onTap="selectSearchTime">{{search.time.split('-')[0]}}年{{search.time.split('-')[1]}}月{{search.time.split('-')[2]}}日</view>
-    <view class="iconfont iconicon_open"></view>
+    <view class="iconfont iconicon_open" onTap="selectSearchTime"></view>
   </view>
 </view>
 <view class="roomScrollView" style="{{canScroll ? '': 'overflow:hidden'}}"">