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

components/taskPanel/taskPanel.js

@@ -47,7 +47,7 @@ create.Component({
     complete: throttle(
       function () {
         const { currentTask } = this.store.data;
-        if (!currentTask.taskInfos.taskTitle) {
+        if ((currentTask.taskInfos && !currentTask.taskInfos.taskTitle) || !currentTask.taskInfos) {
           return
         }
         this.props.onComplete()

pages/meetingDetail/meetingDetail.axml

@@ -224,7 +224,7 @@
             </view>
             <file-list fileView="{{item.fileView}}" organizer="{{organizer}}" currentPeople="{{currentPeople}}" onDeleteMeetingFile="deleteMeetingFile"/>
           </view>
-          <view a:if="{{item.content}}" class='simple-column'>{{item.content}} {{item.createTime}}</view>
+          <view a:if="{{item.content && ((item.category == 1 || item.taskViewList && item.taskViewList.length > 0) || ( item.fileView && item.fileView.fileInfos && item.fileView.fileInfos.length > 0 ))}}" class='simple-column'>{{item.content}} {{item.createTime}}</view>
         </block>
         <view class="affair-placeholder" a:if="{{affairList.length == 1 && affairList[0].logType == 'create_schedule'}}">
           <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>