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

pages/files/files.axml

-<view class="file-container" a:for="{{files}}">
-  <file-list fileView="{{item}}"/>
+<view class="file-container" a:for="{{[files]}}" customClass="1">
+  <file-list fileInfos="{{item}}"/>
 </view>
\ No newline at end of file

pages/meetingDetail/meetingDetail.acss

@@ -236,11 +236,11 @@ input {
     margin-top: 48rpx;
 }
 
-.place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon, .meetingWayShowTop>.icon {
+.place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon, .meetingWayShowTop>.icon, .taskNumber>.icon {
     margin-right: 24rpx;
 }
 
-.noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay, .meetingWayText {
+.noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay, .meetingWayText, .fileText {
     font-size: 34rpx;
     width: 100%;
     line-height: 1.5;

pages/meetingDetail/meetingDetail.axml

@@ -103,17 +103,17 @@
         </view>
       </view>
       <!-- 几个任务 -->
-      <view onTap="goTasksPage" class="taskNumber">
+      <view onTap="goTasksPage" class="taskNumber" a:if="{{tasks.length}}">
         <view class="iconicon_attender iconfont icon {{$data.showParticipatorList.length>1 ? '' : 'noValueIcon'}}"></view>
-        <view>
+        <view class="fileText">
                 {{tasks.length}} 个任务
         </view>
         <view class="iconright iconfont icon" style="  vertical-align: middle"></view>
       </view>
       <!-- 几个文件 -->
-      <view onTap="goFilesPage" class="taskNumber">
+      <view onTap="goFilesPage" class="taskNumber" a:if="{{files.length}}">
         <view class="iconicon_attender iconfont icon {{$data.showParticipatorList.length>1 ? '' : 'noValueIcon'}}"></view>
-        <view>
+        <view class="fileText">
                 {{files.length}} 个附件
         </view>
         <view class="iconright iconfont icon" style="  vertical-align: middle"></view>

pages/meetingDetail/meetingDetail.js

@@ -960,7 +960,12 @@ create.Page({
       if (it.commentType === 'task') {
         tasks.push(it)
       } else if (it.commentType === 'file') {
-        files.push(it)
+        if (!it.fileDetailList) {
+          return
+        }
+        for (let i = 0; i < it.fileDetailList.length; i++) {
+          files.push(it.fileDetailList[i])
+        }
       }
     })
     this.store.data.files = files;