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

components/meetingTimePicker/meetingTimePicker.js

 import { getInterTime } from '../../utils/utils';
 const currentDate = new Date();
 const weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
-const durationList = [{ value: 60, label: '1小时' }, { value: 120, label: '2小时' }, { value: 30, label: '30分钟' }];
+const durationList = [{ value: 30, label: '30分钟' }, { value: 60, label: '1小时' }, { value: 120, label: '2小时' }];
 const timeData = generateDate(365);
 const timeHour = generateHour(24);
 const timeMin = generateMin(60);
@@ -160,7 +160,7 @@ Component({
       showTime: '',
     },
     duration: {
-      pickValue: [2],
+      pickValue: [0],
       showTime: '',
       label: '30分钟',
     },
@@ -176,7 +176,8 @@ Component({
   },
   didUpdate() {
   },
-  didUnmount() { },
+  didUnmount() {
+  },
   methods: {
     //设置初始值
     setInitialValue() {
@@ -193,7 +194,6 @@ Component({
       if (this.props.endTime) {
         endDate = new Date(this.props.endTime);
       }
-      console.log(this.props)
 
       this.changeStart(startDate);
       this.changeEnd(endDate);

components/popup/index.axml

@@ -2,7 +2,7 @@
   <view class="dm-popup-mask" a:if="{{mask}}" onTap="onMaskTap" style="z-index: {{zIndex}}"></view>
   <view class="dm-popup-content {{className}} dm-popup-{{position}}" style="z-index: {{zIndex}}">
     <view a:if="{{position == 'bottom'}}" class="close-icon">
-      <text onTap="onMaskTap" class="iconfont iconicon_slide"></text>
+      <text onTap="onMaskTap" class="iconfont iconicon_slide" catchTouchStart="onMaskTap" catchTouchMove="onMaskTap" catchTouchEnd="onMaskTap"></text>
       <!--<text class="popupComplet">完成</text> -->
     </view>
     <view class="popup-title" a:if="{{title}}">{{title}}</view>

components/taskPanel/taskPanel.acss

@@ -51,13 +51,17 @@
     margin-right: 16rpx;
 }
 
-.people>.avater {
+.people>.avater, .fake-avater {
     width: 80rpx;
     height: 80rpx;
     line-height: 80rpx;
     position: relative;
 }
 
+.fake-name {
+    height: 40rpx;
+}
+
 .name {
     font-size: 24rpx;
     line-height: 40rpx;

components/taskPanel/taskPanel.axml

@@ -18,5 +18,11 @@
       <view class="name">{{currentTask.acceptorInfo.username}}</view>
     </view>
   </view>
+  <view class="participator-bottom" a:else>
+    <view class="people">
+      <view class="fake-avater"></view>
+      <view class="fake-name"></view>
+    </view>
+  </view>
 </view>
 <template a:if="{{action == 'update'}}" is="deleteBtn" data="{{title: '删除该任务' }}"/>
\ No newline at end of file

pages/meetingDetail/meetingDetail.axml

@@ -188,7 +188,7 @@
           <text class="iconfont iconicon_data"></text>文件
         </view>
         <text class="devider"></text>
-        <view>
+        <view onTap="onShareAppMessage">
           <text class="iconfont iconicon_share1"></text>
         </view>
       </view>
@@ -228,13 +228,13 @@
         </view>
       </block>
       <view a:else>正在加载</view>
-      <popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
+      <popup a:if="{{popupShow}}" title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
         <meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}"></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}}">
+      <popup a:if="{{show}}" show="{{show}}" onClose="closePop" title="{{pop.title}}">
         <!-- 任务创建弹出框 -->
         <task-panel a:if="{{pop.type === 'createTask'}}" onComplete="complete" action='create'/>
         <!-- 任务修改弹出框 -->

pages/meetingDetail/meetingDetail.js

@@ -1458,6 +1458,16 @@ create.Page({
     this.setData({
       isExpand: false
     })
+  },
+  onShareAppMessage() {
+    console.log('click')
+    return {
+      type: 1, //分享类型，0:全部组件 默认； 1:只能分享到钉钉；2:不能分享，只有刷新按钮
+      control: true,
+      title: '明我会议室标题',
+      desc: '明我会议室描述',
+      path: 'pages/index/index'
+    };
   }
 });