时间

components/list/list.axml

@@ -11,6 +11,7 @@
         </view>
         <view a:if="{{!multiple}}" class="iconfont iconicon_ok com-list-item-selectStaus {{comSelectListId == item.id ? 'com-list-item-select' : ''}}">
         </view>
+        {{comSelectList}}  {{id}}
         <view a:if="{{multiple}}" class="iconfont iconicon_ok com-list-item-selectStaus {{comSelectList.includes(item.id) ? 'com-list-item-select' : ''}}">
         </view>
     </view>

components/list/list.js

@@ -25,6 +25,11 @@ Component({
   methods: {
     comSelectList(event) {
       if (this.props.multiple && event.currentTarget.dataset.item.id != -1) {
+        if (this.data.comSelectList.includes(-1)) {
+          this.setData({
+            comSelectList: []
+          })
+        }
         if (this.data.comSelectList.includes(event.target.dataset.item.id)) {
           this.data.comSelectList.forEach((item, index) => {
             if (item == event.target.dataset.item.id) {

pages/meetingDetail/meetingDetail.axml

 <block a:if="{{getData}}">
   <import src="../../template/deleteBtn/index.axml"/>
-  <view class="hideDetail" a:if="{{confirmAttendance === 1&&onload || organizer ===  currentPeople&&onload}}">
+  <view class="hideDetail" a:if="{{isExpand}}">
     <view class="hideTitle">
       {{title}}
     </view>
@@ -32,7 +32,7 @@
       </view>
     </view>
     <!-- roomId locationName 地点  -->
-    <view class="permissionContant">
+    <view class="permissionContant" a:if="{{$data.locationName || currentPeople === organizer}}">
       <view class="permission" a:if="{{currentPeople != organizer}}">
       </view>
       <view class="place">
@@ -117,7 +117,7 @@
       </view>
     </view>
     <!-- meetingWay 会议方式 -->
-    <view class="permissionContant">
+    <view class="permissionContant" a:if="{{comListData.meetingWayList[comListData.meetingWayModelId].text || currentPeople === organizer}}">
       <!--<view class="iconicon_attender iconfont icon {{$data.participatorList.length>1 ? '' : 'noValueIcon'}}"></view> -->
       <view class="meetingWay">
         <view class="iconicon_meet iconfont icon {{comListData.meetingWayModelId ? '' : 'noValueIcon'}}">
@@ -138,19 +138,11 @@
     </view>
     <!-- 删除该会议 -->
     <template is="deleteBtn" onhandleDelete="" data="{{title: '删除该会议' }}"/>
-    <!--<view class="delMetting" onTap="delSheudle"><view class=" iconfont iconicon_close"></view><view>
-          删除该会议</view></view> -->
-    <popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
-      <meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete"></meeting-time-picker>
-      <hlist a:if="{{'participator' === comType}}" dataComList="{{comHListData.contactData}}" onSelectComHList="selectComHList"></hlist>
-      <list multiple="{{comListData.multiple}}" onCompelete="selectAheadtimes" comSelectList={{aheadTimes}} complete="{{comType=='aheadTime' ? true : false}}"a:if="{{comType=='repeat' || comType=='meetingWayModel' || comType=='aheadTime'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : (comType=='aheadTime' ? comListData.aheadTimesList : comListData.meetingWayList)}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : (comType=='aheadTime'?comListData.aheadTimesListId : comListData.meetingWayModelId)}}" iconType="{{comListData.iconType}}">
-      </list>
-    </popup>
   </view>
   <!-- 底部导航栏 -->
   <view class="footNav">
     <view class="footNavTop">
-      <view class="originStaus" a:if="{{(currentPeople != organizer)&&confirmAttendance === null}}">
+      <view class="originStaus" a:if="{{confirmAttendance === null}}">
         <view catchTap="participate">
           <text class="iconfont iconicon_Agreed1"></text>
           <text>参加</text></view>
@@ -227,6 +219,14 @@
       <view onTap="addMeetingFile" class="affair-placeholder-button">添加会议文件</view>
     </view>
   </view>
+  <!--<view class="delMetting" onTap="delSheudle"><view class=" iconfont iconicon_close"></view><view>
+          删除该会议</view></view> -->
+  <popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
+    <meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete"></meeting-time-picker>
+    <hlist a:if="{{'participator' === comType}}" dataComList="{{comHListData.contactData}}" onSelectComHList="selectComHList"></hlist>
+    <list multiple="{{comListData.multiple}}" onCompelete="selectAheadtimes" comSelectList="{{comListData.aheadTimesListId}}" complete="{{comType=='aheadTime' ? true : false}}"a:if="{{comType=='repeat' || comType=='meetingWayModel' || comType=='aheadTime'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : (comType=='aheadTime' ? comListData.aheadTimesList : comListData.meetingWayList)}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : (comType=='aheadTime'?comListData.aheadTimesListId : comListData.meetingWayModelId)}}" iconType="{{comListData.iconType}}">
+    </list>
+  </popup>
   <popup show="{{show}}" onClose="closePop" title="{{pop.title}}">
     <!-- 任务创建弹出框 -->
     <task-panel a:if="{{pop.type === 'createTask'}}" onComplete="complete" action='create'/>

pages/meetingDetail/meetingDetail.js

@@ -45,7 +45,7 @@ create.Page({
       ],
       multiple: false,
       complete: false,
-      aheadTimesListId: [-1],
+      aheadTimesListId: [15],
       comSelectListId: 0,
       meetingWayModelId: null,
       iconType: 'icon'
@@ -104,7 +104,7 @@ create.Page({
     currentPeople: '',
     editType: '',
     confirmAttendance: null,
-    onload: false,
+    isExpand: false,
     c: false
   },
   onShow() {
@@ -124,7 +124,6 @@ create.Page({
     })
     this.setData({
       scheduleItem: JSON.parse(event.scheduleItem),
-      onload: true,
       currentPeople: getApp().globalData.userid
     })
     this.getDetail()
@@ -158,9 +157,9 @@ create.Page({
             participatorUserId.push(value.participator.userId)
             originUsers.push(value.participator)
             if (value.userId === getApp().globalData.userid) {
-              debugger
               this.setData({
-                aheadTimes: !!value.aheadList ? value.aheadList : [-1]
+                aheadTimes: !!value.aheadList ? value.aheadList : [],
+                'comListData.aheadTimesListId': !!value.aheadList ? value.aheadList : [-1]
               })
             }
           }
@@ -180,6 +179,7 @@ create.Page({
           recurrenceModel: res.data.data.repeatable ? { model: res.data.data.recurrenceModel.model, daysOfMonth: res.data.data.recurrenceModel.daysOfMonth, interval: 1, initialTime: res.data.data.recurrenceModel.initialTime, terminateTime: res.data.data.recurrenceModel.terminateTime, weekDayList: res.data.data.recurrenceModel.weekDayList } : { model: 'no_repeat' },
           title: res.data.data.title,
           remark: res.data.data.remark,
+          isExpand: res.data.data.confirmAttendance === 1 ? true : false,
           isShowRemark: res.data.data.remark ? true : false,
           week: this.data.weekList[new Date(res.data.data.startTime.replace(/'-'/g, "\/")).getDay()],
           getData: true
@@ -200,13 +200,10 @@ create.Page({
         this.$store.data.originUsersId = participatorUserId
         this.update()
         this.conflictPeople()
-
-
         this.store.data.scheduleId = res.data.data.id;
         this.store.data.groupId = res.data.data.groupId;
         this.update();
         this.reload(this.data.scheduleItem.id);
-        console.log(res.data.data)
       }
     })
   },
@@ -324,28 +321,33 @@ create.Page({
       popupShow: false
     })
   },
-  // 选择循环机制 选择会议方式  选择时间  出现popup弹窗
+  // 选择循环机制 选择会议方式  选择时间  会前提醒 出现popup弹窗
   showPopup(event) {
     let iconType = ''
     let complete = false
     let multiple = false
+    let popupTitle = ''
     switch (event.currentTarget.dataset.type) {
       case 'meetingWayModel':
         iconType = 'image',
-          complete = true
+          complete = true,
+          popupTitle = '选择会议方式',
           multiple = false
         break
       case 'repeat':
         iconType = 'icon',
+          popupTitle = '会议重复',
           complete = true,
           multiple = false
         break
       case 'participator':
-
+        popupTitle = '选择参会人'
         break
       case 'time':
+        popupTitle = '选择会议时间'
         break
       case 'aheadTime':
+        popupTitle = '选择会前提醒'
         iconType = 'icon',
           complete = true,
           multiple = true
@@ -353,6 +355,7 @@ create.Page({
     }
     this.setData({
       popupShow: true,
+      popupTitle: popupTitle,
       comType: event.currentTarget.dataset.type,
       'comListData.complete': complete,
       'comListData.iconType': iconType,
@@ -520,7 +523,7 @@ create.Page({
     }
     return Object.values(containt)
   },
-  // 点击完成
+  //  选择时间 点击完成
   onComplete(event) {
     this.$store.data.startTime = `${event.startTime}:00`
     this.$store.data.endTime = `${event.endTime}:00`
@@ -542,9 +545,12 @@ create.Page({
   },
   // 选择会前提醒时间
   selectAheadtimes(event) {
+    console.log(event)
+    debugger
     this.setData({
       aheadTimes: event,
-      popupShow: false
+      popupShow: false,
+      'comListData.aheadTimesListId': event.length == 0 ? [-1] : event
     })
     if (this.data.repeatable) {
       this.setData({
@@ -573,7 +579,7 @@ create.Page({
             'conToastData.showToast': true,
             'conToastData.title': '保存成功'
           })
-          if (this.$store.data.originalData.repeatable === 1) {
+          if (this.$store.data.originalData.repeatable === 1 && !!res.data.data) {
             observer.notice(res.data.data)
           }
           return resolve(res)
@@ -1399,7 +1405,7 @@ create.Page({
   //
   expand() {
     this.setData({
-      onload: false
+      isExpand: false
     })
   }
 });