feat: 会议详情的动态列表渲染

api/request.js

@@ -149,7 +149,7 @@ export function getMeetingRoomRepeatAffairs(groupId, page) {
 export function getMeetingRoomAffairs(id) {
   return $http({
     method: "get",
-    url: `/meet/meeting-log/detail/${id}`
+    url: `/meet/comment/listByMeetingId?meetingId=${'71ca8d07c9830d7630a6e6bb0f432a59'}`
   });
 }
 //会议室创建新任务

pages/meetingDetail/meetingDetail.acss

@@ -5,6 +5,12 @@
     /* height: calc(100vh - 200rpx); */
 }
 
+.meeting-title {
+    font-size: 32rpx;
+    color: rgba(10, 10, 10, 0.56);
+    margin-top: 8px;
+}
+
 page {
     background: #fff;
 }
@@ -30,6 +36,15 @@ page {
     padding-top: 16rpx;
 }
 
+.compose-column-operation {
+    display: flex;
+    justify-content: flex-end;
+}
+
+.compose-column-operation>text {
+    margin-right: 32rpx;
+}
+
 .compose-column>.avater {
     width: 80rpx;
     height: 80rpx;

pages/meetingDetail/meetingDetail.axml

@@ -228,26 +228,23 @@
     <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: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>
-            </view>
+        <block a:if="{{affairList && affairList.length > 0}}" a:for="{{affairList}}" key="{{item.commentId}}">
+          <view class='compose-column'>
+            <template is="avater" data="{{item: item.creator }}"/>
             <view class="title">
-              会议任务
-              <text>{{item.createTime}}</text>
+              {{item.creator.name}}
+              <text>{{item.updateTime}}</text>
             </view>
-            <task-list onShowPop="showPop" onSetCurrentTask="setCurrentTask" taskList="{{item.taskViewList}}" onChangeTaskStatusOnList="changeTaskStatusOnList"/>
+            <task-list a:if="{{item.meetingTaskSimpleViewModel}}" onChangeTaskStatusOnList="onChangeTaskStatusOnList" taskView="{{item.meetingTaskSimpleViewModel}}" commentId="{{item.commentId}}" meetingId="{{meetingId}}" isCanEdit="{{false}}"/>
+            <file-list a:if="{{item.fileDetailList}}" fileView="{{item}}"/>
+            <notes a:if="{{item.notes}}" notes="{{item.notes}}"/>
+            <view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view>
           </view>
-          <view a:if="{{item.category == '2' && item.fileView && item.fileView.fileInfos && item.fileView.fileInfos.length > 0 }}" class='compose-column'>
-            <template is="avater" data="{{item: item.fileView.creatorInfo}}"/>
-            <view class="title">
-              {{item.fileView.creatorInfo.username}}
-              <text>{{item.createTime}}</text>
-            </view>
-            <file-list fileView="{{item.fileView}}" organizer="{{organizer}}" currentPeople="{{currentPeople}}" onDeleteMeetingFile="deleteMeetingFile"/>
+          <view class="compose-column-operation">
+            <text>编辑</text>
+            <text>删除</text>
+            <text>评论</text>
           </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 || affairList.length == 0}}">
           <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>
@@ -255,7 +252,7 @@
         <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">
+      <popup a:show="{{popupShow}}" title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
         <meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}" isIPX="{{isIPX}}"></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=='aheadTime'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : comListData.aheadTimesList}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : comListData.aheadTimesListId}}" iconType="{{comListData.iconType}}"></list>

pages/meetingDetail/meetingDetail.js

@@ -1548,31 +1548,7 @@ create.Page({
   dealAffairData(affairList) {
     return affairList.map(it => {
       if (it.createTime) {
-        it.createTime = getCreateShowTime(it.createTime);
-      }
-      if (it.category == '2' && it.fileView) {
-        if (it.fileView.creatorInfo) {
-          it.fileView.creatorInfo = JSON.parse(it.fileView.creatorInfo);
-        }
-        if (it.fileView.fileInfos) {
-          it.fileView.fileInfos = JSON.parse(it.fileView.fileInfos)
-        }
-        return it
-      }
-      else if (it.category === '3' && it.taskViewList) {
-        it.taskViewList.map(o => {
-          if (o.acceptorInfo) {
-            o.acceptorInfo = JSON.parse(o.acceptorInfo)
-          }
-          if (o.creatorInfo) {
-            o.creatorInfo = JSON.parse(o.creatorInfo)
-          }
-          if (o.taskInfos) {
-            o.taskInfos = JSON.parse(o.taskInfos)
-          }
-          return o
-        })
-        return it
+        it.updateTime = getCreateShowTime(it.updateTime);
       }
       return it
     })

template/avater/index.axml

@@ -3,7 +3,6 @@
     <view class="avater">
         <image a:if="{{item.avatar}}" mode="scaleToFill" src="{{item.avatar}}" />
         <text a:else>{{item.name.slice(0, split || 2)}}
-        {{item.name}}
         </text>
     </view>
 </template>
\ No newline at end of file