feat: 重复会议动态修改

api/request.js

@@ -138,7 +138,13 @@ export function isParticipate(data) {
     url: `/meet/schedule/confirm`
   });
 }
-
+//会议室详情的获取重复会议动态列表
+export function getMeetingRoomRepeatAffairs(groupId, page) {
+  return $http({
+    method: "get",
+    url: `/meet/meeting-log/scheduleTemplateMeetingLogPage?category=2,3&groupId=${groupId}&size=10&current=${page}`
+  });
+}
 //会议室详情的获取动态列表
 export function getMeetingRoomAffairs(id) {
   return $http({

api/xFetch.js

@@ -28,6 +28,7 @@ export default function xFetch({ url, method, data, type }) {
                 }
             },
             fail: function (err) {
+                console.log(err)
                 alertOnce('网络异常，请重试', rejects);
             }
         });

app.js

@@ -20,6 +20,7 @@ App({
     userid: "",
     name: "",
     userInfo: "",
+    // globalUrl: "http://192.168.1.101:9999", //beta地址
     globalUrl: "https://gateway-beta.mingwork.com", //beta地址
     globalUrl2: "https://third-authentication-beta.mingwork.com"
     // globalUrl: "https://gateway2.mingwork.com", // 线上地址

components/taskPanel/taskPanel.acss

@@ -34,6 +34,11 @@
     font-size: 34rpx;
 }
 
+.iconicon_attender {
+    position: relative;
+    top: 4rpx;
+}
+
 .participator-title {
     color: rgba(25, 31, 37, 1);
     font-size: 34rpx;

pages/meetingDetail/meetingDetail.acss

@@ -2,6 +2,7 @@
 .affair-list {
     background: #fff;
     padding: 48rpx 32rpx 220rpx 32rpx;
+    /* height: calc(100vh - 200rpx); */
 }
 
 .affair-list-margin-top {
@@ -113,7 +114,9 @@ page {
     background: #fff;
     z-index: 1;
     position: relative;
+    width: 100%;
     padding-bottom: 0;
+    height: 200rpx;
 }
 
 .hideTitle {
@@ -613,4 +616,14 @@ input {
 
 .lineThrough {
     text-decoration: line-through;
+}
+
+.loading-more {
+    color: rgba(234, 12, 40, 1);
+    font-size: 24rpx;
+    text-align: center;
+    width: 400rpx;
+    border-top: 1px solid rgba(239, 242, 245, 1);
+    padding-top: 32rpx;
+    margin: 0 auto 50rpx;
 }
\ No newline at end of file

pages/meetingDetail/meetingDetail.axml

@@ -202,10 +202,10 @@
     <!-- 动态列表 -->
     <import src="../../template/avater/index.axml"/>
     <import src="../../template/affairBlank/index.axml"/>
-    <view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate">
+    <scroll-view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate" scroll-y="{{true}}" lower-threshold="{{400}}" onScrollToLower="onScrollToLower">
       <view a:if="{{!isExpand}}" class="affair-list-title">会议动态</view>
       <block a:if="{{!affairLoading}}">
-        <block a:for="{{affairList}}">
+        <block 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>
@@ -226,6 +226,7 @@
           </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'}}">
           <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>
         </view>
@@ -243,7 +244,7 @@
         <!-- 任务修改弹出框 -->
         <task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/>
       </popup>
-    </view>
+    </scroll-view>
   </view>
 </block>
 <view class="loading" a:if="{{loading || !getData}}">