Merge branch 'release/dev/2.0.0' into release/2.0.0

components/taskList/taskList.acss

@@ -24,11 +24,12 @@
     flex: 1;
     font-size: 28rpx;
     line-height: 40rpx;
-    white-space: nowrap;
+    /* white-space: nowrap;
     text-overflow: ellipsis;
-    overflow: hidden;
+    overflow: hidden; */
     display: flex;
     flex-direction: column;
+    word-break: break-all;
 }
 
 .task-title .task-time {

pages/meetingDetail/meetingDetail.js

@@ -868,12 +868,12 @@ create.Page({
         if (res.data.code !== 0) {
           return
         }
-        if (_that.data.currentPeople === _that.data.organizer) {
-          _that.setData({
-            'aheadTime.aheadTimes': [15],
-            'aheadTime.aheadTimesListId': [15],
-          })
-        }
+        // if (_that.data.currentPeople === _that.data.organizer) {
+        //   _that.setData({
+        //     'aheadTime.aheadTimes': [15],
+        //     'aheadTime.aheadTimesListId': [15],
+        //   })
+        // }
         _that.setData({
           confirmAttendance: dataParticipate.value
         })

pages/meetingRoomList/meetingRoomList.axml

@@ -16,9 +16,9 @@
             <text class="locationIcon iconfont iconicon_facility1"></text>
             <text a:for="{{item.equipFacilityNames}}" a:if="{{item2 !== null}}" a:for-item="item2" a:for-index="index2">{{item2}}{{index2 === item.equipFacilityNames.length-1 ? '' : '/'}}</text>
           </view>
-          <view class="reserveRoomNumAndLocation">
+          <view class="reserveRoomNumAndLocation" a:if="{{item.capacityNum}}">
             <view class="reserveRoomNum">
-              <text class="locationIcon iconfont iconicon_attender"></text>{{item.capacityNum}}
+              <text class="locationIcon iconfont iconpeople1"></text>{{item.capacityNum}}
             </view>
           </view>
         </view>

pages/place/place.acss

@@ -56,6 +56,7 @@ page {
 }
 
 .mettingRoom {
+    /* padding: 20rpx 0; */
     height: 112rpx;
     display: flex;
     padding-left: 32rpx;

pages/place/place.axml

@@ -18,9 +18,9 @@
           <view class="name">
             {{item.meetingRoomFullName ? item.meetingRoomFullName : item.name}}
           </view>
-          <view class="mettingRoomDetail">
-            <view class="num">
-              <text class="numIcon iconfont iconcanhuiren iconicon_attender"></text>
+          <view class="mettingRoomDetail" a:if="{{item.capacityNum || item.equipFacilityLabelList }}">
+            <view class="num" a:if="{{item.capacityNum}}">
+              <text class="numIcon iconfont iconpeople1 iconicon_attender"></text>
               <text>{{item.capacityNum}}</text>
             </view>
             <view class="equipment" a:if="{{item.equipFacilityLabelList}}">