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

components/fileList/fileList.axml

@@ -12,7 +12,8 @@
       <view a:if="{{isCanDelete}}" class="iconfont iconicon_noAgreed1" catchTap="removeFile" data-id="{{item.fileId}}"></view>
     </view>
   </view>
-  <view class="btns-pop" a:if="{{fileView.id == logId && (organizer === currentPeople ? true : currentPeople === fileView.creatorId)}}">
+  <!-- && (organizer === currentPeople ? true : currentPeople === fileView.creatorId) -->
+  <view class="btns-pop" a:if="{{fileView.id == logId}}">
     <view class="edit" catchTap="updateFile" data-fileView="{{fileView}}">
           编辑
     </view>

pages/index/index.js

@@ -810,7 +810,7 @@ create.Page({
     maxClickCount--;
     if (maxClickCount == 0) {
       dd.alert({
-        content: "0.0.12"
+        content: "0.0.13"
       });
       maxClickCount = 5;
     }

pages/meetingDetail/meetingDetail.acss

@@ -529,7 +529,6 @@ input {
 }
 
 .affair-placeholder {
-    border-top: 1px solid rgba(239, 242, 245, 1);
     padding-top: 168rpx;
     text-align: center;
     width: 600rpx;

pages/meetingDetail/meetingDetail.axml

@@ -224,7 +224,7 @@
     <view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate">
       <view a:if="{{!isExpand}}" class="affair-list-title">会议动态</view>
       <block a:if="{{!affairLoading}}">
-        <block a:for="{{affairList}}" key="{{item.id}}">
+        <block a:if="{{affairList && affairList.length > 0}}" a:for="{{affairList}}" key="{{item.id}}">
           <view a:if="{{item.category == '3' && item.taskViewList && item.taskViewList.length > 0}}" class='compose-column'>
             <view class="avater task-avater">
               <text class="iconfont iconicon_task1"></text>
@@ -245,10 +245,10 @@
           </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="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view>
-        <view class="affair-placeholder" a:if="{{affairList.length == 1 && affairList[0].logType == 'create_schedule'}}">
+        <view class="affair-placeholder" a:if="{{!affairList || affairList.length == 0}}">
           <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>
         </view>
+        <view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view>
       </block>
       <view a:else></view>
       <popup a:if="{{popupShow}}" title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">