Merge branch 'release/2.0.0' of…

Merge branch 'release/2.0.0' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into release/2.0.0

# Conflicts:
#	pages/createTask/createTask.js
#	pages/meetingDetail/meetingDetail.axml
#	pages/meetingDetail/meetingDetail.js

pages/createMeeting/createMeeting.axml

@@ -86,6 +86,6 @@
     </view>
     <popup title="{{popup.title}}" show="{{popup.show}}" mask="{{popup.mask}}" onClose="closePopup">
         <meeting-time-picker a:if="{{'time' === popup.type}}" onComplete="onComplete" isIPX="{{isIPX}}"></meeting-time-picker>
-        <list a:if="{{popup.type=='repeat'}}" dataComList="{{repeat.repeatList}}" onComSelectList="selectRepeatListItem"></list>
+        <list a:if="{{popup.type=='repeat'}}" dataComList="{{repeat.repeatList}}" comSelectListId="{{repeat.selectRepeatId}}" onComSelectList="selectRepeatListItem"></list>
     </popup>
 </view>
\ No newline at end of file

pages/meetingDetail/constant.js

@@ -17,4 +17,5 @@ export const centerPopupList = [
     { id: "Y", text: '发送通知' }
 ]
 export const editSaveList = [{ text: '仅保存此会议', id: 'only' }, { text: '保存此次及以后会议', id: 'future' }]
+export const delSheudleList = [{ text: '仅删除此会议', id: 'only' }, { text: '删除此次及以后会议', id: 'future' }]
 

pages/meetingDetail/meetingDetail.axml

@@ -164,10 +164,17 @@
       <view class="tabBarBottom" a:if="{{isIPX}}">
       </view>
     </view>
-    <selectpopup showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectParticipateStatus" onSelectPopupCancel="handleSelectPopupCancel"></selectpopup>
+    <!--<selectpopup showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectParticipateStatus" onSelectPopupCancel="handleSelectPopupCancel"></selectpopup> -->
+    <selectpopup a:if="{{selectPopup.type === 'repeat'}}" showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectSaveRepeatStatus" onSelectPopupCancel="handleSelectPopupCancel"></selectpopup>
     <selectpopup a:if="{{selectPopup.type === 'participateState'}}" showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectParticipateStatus" onSelectPopupCancel="handleSelectPopupCancel"></selectpopup>
-    <selectpopup a:if="{{selectPopup.type === 'modify_location'}}" showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectSavePlaceStatus" onSelectPopupCancel="handleSelectPopupCancel"></selectpopup>
+    <selectpopup a:if="{{selectPopup.type === 'deleteState'}}" showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectDeleteStatus" onSelectPopupCancel="handleSelectPopupCancel"></selectpopup>
+    <selectpopup a:if="{{selectPopup.type === 'modify_location'}}" showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectSavePlaceStatus" onSelectPopupCancel="handleSelectPopupPlaceCancel"></selectpopup>
+    <selectpopup a:if="{{selectPopup.type === 'modify_time'}}" showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectSaveTimeStatus" onSelectPopupCancel="handleSelectPopupTimeCancel"></selectpopup>
+    <selectpopup a:if="{{selectPopup.type === 'operate_user'}}" showSelectPopup="{{selectPopup.show}}" selectPopupList="{{selectPopup.list}}" onSelectPopup="selectSavePeopleStatus" onSelectPopupCancel="handleSelectPopupPeopleCancel"></selectpopup>
     <centerpopup a:if="{{centerPopup.type === 'modify_location'}}" centerPopup="{{centerPopup.show}}" centerPopupList="{{centerPopup.list}}" onSelectSend="selectPlaceNeedNotice"></centerpopup>
+    <centerpopup a:if="{{centerPopup.type === 'modify_time'}}" centerPopup="{{centerPopup.show}}" centerPopupList="{{centerPopup.list}}" onSelectSend="selectTimeNeedNotice"></centerpopup>
+    <centerpopup a:if="{{centerPopup.type === 'operate_user'}}" centerPopup="{{centerPopup.show}}" centerPopupList="{{centerPopup.list}}" onSelectSend="selectPeopleNeedNotice"></centerpopup>
+    <centerpopup a:if="{{centerPopup.type === 'repeat'}}" centerPopup="{{centerPopup.show}}" centerPopupList="{{centerPopup.list}}" onSelectSend="selectRepeatNeedNotice"></centerpopup>
     <toast showToast="{{conToastData.showToast}}" title="{{conToastData.title}}" onToastHidden="onToastHidden"></toast>
     <!-- 动态列表 -->
     <import src="../../template/avater/index.axml"/>
@@ -212,7 +219,7 @@
       <popup title="{{popup.title}}" show="{{popup.show}}" mask="true" onClose="closePopup">
         <remark a:if="{{popup.type == 'remarkModal'}}" onGetRemark="getRemark"/>
         <comment a:if="{{popup.type == 'commentModal'}}" isEdit="{{true}}" onGetComment="getComment"/>
-        <list a:if="{{popup.type=='repeat'}}" dataComList="{{repeat.repeatList}}" onComSelectList="selectRepeatListItem"></list>
+        <list a:if="{{popup.type=='repeat'}}" dataComList="{{repeat.repeatList}}" comSelectListId="{{repeat.selectRepeatId}}" onComSelectList="selectRepeatListItem"></list>
         <notes a:if="{{popup.type == 'notesModal'}}" isEdit="{{true}}" onGetNotes="getNotes"/>
         <meeting-time-picker a:if="{{'time' === popup.type}}" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}" onComplete="onComplete" isIPX="{{isIPX}}"></meeting-time-picker>
         <list a:if="{{popup.type=='aheadTime'}}" onClose="closePopup" multiple="{{true}}" onCompelete="handleAheadTimeSave" complete="{{true}}" dataComList="{{aheadTime.aheadTimeList}}" onComSelectList="selectComList" comSelectList="{{aheadTime.aheadTimesListId}}" iconType="{{aheadTime.iconType}}"></list>

pages/meetingDetail/utils.js

@@ -37,5 +37,5 @@ export function handleChangePeople(originUsers, nowUsers) {
         del: del
     }
 }
-// 重置地点
+// 保存成功以后 修改地点
 

utils/utils.js

@@ -247,7 +247,7 @@ export function dealRepeatModal(item) {
     }
   }
   // 每周的一天重复
-  recurrenceModel.weekDayList = repeatWeek[new Date(globalStore.data.startTime).getDay()]
+  recurrenceModel.weekDayList = [repeatWeek[new Date(globalStore.data.startTime).getDay()]]
   return {
     repeatable: item.repeatable,
     recurrenceModel: recurrenceModel,
@@ -264,7 +264,7 @@ export function modifyTimeImpactRepeat(recurrenceModel) {
   recurrenceModel.initialTime = initialTime
   recurrenceModel.terminateTime = terminateTime
   if (recurrenceModel.model === 'weekly' && recurrenceModel.weekDayList.length === 1) {
-    recurrenceModel.weekDayList = repeatWeek[new Date(globalStore.data.startTime).getDay()]
+    recurrenceModel.weekDayList = [repeatWeek[new Date(globalStore.data.startTime).getDay()]]
   }
   if (recurrenceModel.model === 'absolute_Monthly') {
     recurrenceModel.daysOfMonth = [new Date(globalStore.data.startTime).getDate()]