fix: indexpage dynamiclist page data get

PageComponents/myDynamic/myDynamic.acss

@@ -4,6 +4,7 @@
     overflow: hidden;
     box-sizing: border-box;
     padding-bottom: 120rpx;
+    height: calc(100vh - 120rpx);
 }
 
 .dynamicList {

PageComponents/myDynamic/myDynamic.axml

 <import src="../../template/affairBlank/index.axml"/>
-<view class="{{isStopBodyScroll ? 'scroll-lock' : ''}}" onTap="closeSwipe" onTouchStart="closeSwipe">
-  <view a:if="{{dynamicList.length !== 0}}" scroll-y="{{true}}" class="dynamicBox" onScrollToLower="onScrollToLower">
+<view class="{{isStopBodyScroll ? 'scroll-lock' : ''}}" onTap="closeSwipe" onTouchStart="closeSwipe" onTouchMove="closeSwipe" onTouchEnd="closeSwipe">
+  <block a:if="{{!loading}}">
+    <scroll-view a:if="{{dynamicList.length > 0}}" scroll-y="{{true}}" class="dynamicBox" onScrollToLower="onScrollToLower">
       <view class="dynamicList">
         <swipe onSetBodyDisableScroll="setBodyDisableScroll" rightWidth="{{ 78 }}" leftWidth="{{ 0 }}" a:for="{{dynamicList}}" class="dynamicContent">
           <view class="dynamicDetails">
             <view class="meetingtitle">
               <view>
-            {{item.title}}
+            {{item.title}}{{index}}
               </view>
               <view>
-              <text a:if="{{item.traceTime !== '1970-03-01 00:00:00'}}" class="iconfont iconicon_top1"></text>
+                <text a:if="{{item.traceTime !== traceTime}}" class="iconfont iconicon_top1"></text>
               </view>
             </view>
             <block a:for="{{item.meetingLogDataList.slice(0,2)}}" a:for-item="dynamicItem">
@@ -25,13 +26,17 @@
               </view>
             </block>
           </view>
-        <view slot="right" class="placedTop" onTap="changeCollection" data-scheduleid="{{item.scheduleId}}" data-index="{{index}}" data-collection="{{item.traceTime === '1970-03-01 00:00:00' ? 'Y':'N'}}">
-          <text class="iconfont iconicon_top1 {{item.traceTime === '1970-03-01 00:00:00' ? '': 'isTopIcon'}}"></text>
+          <view slot="right" class="placedTop" onTap="changeCollection" data-scheduleId="{{item.scheduleId}}" data-index="{{index}}" data-collection="{{item.traceTime === traceTime ? 'Y':'N'}}">
+            <text class="iconfont iconicon_top1 {{item.traceTime === traceTime ? '': 'isTopIcon'}}"></text>
           </view>
         </swipe>
       </view>
-  </view>
+    </scroll-view>
     <view class="noDate" a:else>
       <template is="affair-placeholder" data="{{title: '展示安排的所有动态', tip: '实时同步所有事件的最新动态，便于随时处理工作内容'}}"/>
     </view>
+  </block>
+  <view class="noDate" a:else>
+    正在加载
+  </view>
 </view>
\ No newline at end of file

PageComponents/myDynamic/myDynamic.js

@@ -9,16 +9,14 @@ import create from 'dd-store';
 create.Component({
   mixins: [],
   data: {
+    traceTime: '1970-03-01 00:00:00',
     isStopBodyScroll: false,
-    isTop: false,
-    isTouchMove: false,
-    touchMoveId: "",
-    startX: "",
-    startY: "",
+    loading: true,
     dynamicList: [],
     current: 1,
-    size: 10,
-    noData: false
+    pages: 1,
+    size: 10
+
   },
   props: {},
   didMount() {
@@ -34,21 +32,22 @@ create.Component({
     },
     //点击页面关闭侧滑模块
     closeSwipe() {
+      if (this.$store.closeActiveSwipe) {
         this.$store.closeActiveSwipe()
+      }
     },
     getPages(current) {
-      let that = this;
-      let data = {
-        current: current,
+      getDynamicList({
+        current,
         size: 10
-      };
-      getDynamicList(data).then(res => {
+      }).then(res => {
+
         if (!res.data.data) {
           return;
         }
+
         // 第一层日程数据处理
-        if (res.data.data) {
-          let dynamicList = res.data.data.records.map((item, index) => {
+        const dynamicList = res.data.data.records.map((item, index) => {
           // 第二层日程下的动态数据处理
           let meetingLogDataList = {};
           let meetingLogDataListArr = [];
@@ -79,14 +78,9 @@ create.Component({
                 if (itemData.acceptorInfo) {
                   itemData.acceptorInfo = JSON.parse(itemData.acceptorInfo);
                 }
-                  // meetingLogDataList[item.meetingLogDataList[i].resourceId] =
-                  //   item.meetingLogDataList[i];
               }
             }
           }
-            // for (let item in meetingLogDataList) {
-            //   meetingLogDataListArr.push(meetingLogDataList[item]);
-            // }
           return {
             scheduleId: item.scheduleId,
             title: item.title,
@@ -94,67 +88,50 @@ create.Component({
             meetingLogDataList: item.meetingLogDataList
           };
         });
+
+        //第一页数据会重新请求需要替换
         if (current === 1) {
-            that.setData({
-              dynamicList: dynamicList,
-              current: current,
-              noData: dynamicList.length === that.data.size ? true : false
+          this.setData({
+            dynamicList
           });
         } else {
-            let dynamicListData = [...that.data.dynamicList];
-            dynamicListData.push.apply(dynamicListData, dynamicList);
-            that.setData({
-              dynamicList: dynamicListData,
-              current: current,
-              noData: dynamicList.length === that.data.size ? true : false
+          const newDynamicList = this.data.dynamicList.concat(dynamicList);
+          this.setData({
+            dynamicList: newDynamicList
           });
         }
-        }
+        this.setData({
+          current: res.data.data.current,
+          pages: res.data.data.pages,
+          loading: false
+        });
       });
     },
     changeCollection(e) {
-      let that = this;
-      let index = e.target.dataset.index;
-      let data = {
-        scheduleId: e.target.dataset.scheduleid,
-        collection: e.target.dataset.collection
-      };
-      meetingCollection(data).then(res => {
-        console.log(res);
-        if (e.target.dataset.collection === "N") {
-          that.setData(
-            {
-              current: 1
-            },
-            () => {
-              that.getPages(1);
-            }
-          );
+      const { index, scheduleId, collection } = e.target.dataset;
+      meetingCollection({
+        scheduleId,
+        collection
+      }).then(res => {
+        //取消置顶
+        if (collection === "N") {
+          // 重新获取第一页的数据 
+          this.getPages(1);
         } else {
-          let dynamicList = [...this.data.dynamicList];
-          let ReplaceItem = dynamicList[index];
-          ReplaceItem.traceTime = res.data.data;
+          //置顶
+          const dynamicList = this.data.dynamicList;
+          const replaceItem = dynamicList[index];
+          dynamicList[index].traceTime = res.data.data;
           dynamicList.splice(index, 1);
-          dynamicList.unshift(ReplaceItem);
-          that.setData({
+          dynamicList.unshift(replaceItem);
+          this.setData({
             dynamicList: dynamicList
           });
         }
       });
     },
-    previewFileInDingTalk(e) {
-      let fileMsg = e.currentTarget.dataset.file;
-      dd.previewFileInDingTalk({
-        corpId: dd.corpId,
-        spaceId: fileMsg.spaceId,
-        fileId: fileMsg.fileId,
-        fileName: fileMsg.fileName,
-        fileSize: fileMsg.fileSize,
-        fileType: fileMsg.fileType
-      });
-    },
     onScrollToLower() {
-      if (!this.data.noData) {
+      if (this.data.current < this.data.pages) {
         this.getPages(this.data.current + 1);
       }
     },
@@ -193,3 +170,4 @@ create.Component({
     }
   }
 });
+

components/swipe/swipe.js

@@ -22,7 +22,6 @@ function range(num, min, max) {
 }
 create.Component({
   mixins: [],
-  offset: 0,
   data: {
     wrapperStyle: ''
   },
@@ -116,7 +115,7 @@ create.Component({
       //恢复页面竖向滚动
       setTimeout(() => {
         this.props.onSetBodyDisableScroll(false);
-      }, 1000)
+      })
 
     },
     open: function (position) {

pages/index/index.json

 {
-    "disableScroll": true,
     "usingComponents": {
         "my-dynamic": "../../PageComponents/myDynamic/myDynamic",
         "my-schedule": "../../PageComponents/scheduleList/scheduleList"