scheduleList add page data

pages/scheduleList/scheduleList.axml

@@ -9,7 +9,7 @@
       </view>
     </view>
   </view>
-  <scroll-view class="indexScrollView" scroll-y="{{true}}" style="background: #FFFFFF" lower-threshold="1000" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
+  <scroll-view class="indexScrollView" scroll-y="{{true}}" style="background: #FFFFFF" lower-threshold="100" onScrollToLower="lower" onScrollToUpper="upper" scroll-into-view="{{todayStr}}">
     <block a:for="{{scheduleList}}" key="{{item.dateStr}}">
       <!-- 年 -->
       <block a:if="{{item.type == 'year'}}">
@@ -25,7 +25,7 @@
       </block>
       <!-- 周 -->
       <block a:elif="{{item.type == 'week'}}">
-        <view class="week" id="{{item.dayStr}}">
+        <view class="week" id="{{item.dateStr}}">
             {{item.value}}
         </view>
       </block>

pages/scheduleList/scheduleList.js

@@ -6,6 +6,7 @@ import {
   getCurrentMonthLast,
   throttle
 } from "../../utils/utils";
+const currentDate = new Date().toLocaleDateString();
 import create from "dd-store";
 create.Page({
   data: {
@@ -26,6 +27,7 @@ create.Page({
     loading: true
   },
   onLoad() {
+    this.resetPagination();
     this.getDate();
     this.setData({
       userMsg: {
@@ -37,7 +39,25 @@ create.Page({
       this.locationScheduleList();
     };
   },
-  getDate: throttle(function(e) {
+  resetPagination() {
+    this.pageSize = 20;
+    this.totalPages = 1;
+    this.currentPage = 1;
+    this.firstPage = 1;
+    this.scheduleList = [];
+  },
+  getPagination(scheduleList = []) {
+    this.scheduleList = scheduleList;
+    this.totalPages = Math.ceil(scheduleList.length / this.pageSize);
+    for (let i = 0; i < scheduleList.length; i++) {
+      if (scheduleList[i].dateStr == currentDate) {
+        this.firstPage = Math.floor(i / this.pageSize);
+        this.currentPage = this.firstPage + 1;
+        break
+      }
+    }
+  },
+  getDate: throttle(function (e) {
     let data = {
       startTime: "2020-01-01 00:00:00",
       endTime: "2025-12-30 23:59:59"
@@ -52,21 +72,23 @@ create.Page({
           let now = new Date();
           let year = now.getFullYear();
           let scheduleList = [];
-          for (let i = 0; i <= year - 2020; i++) {
+          for (let i = 0; i <= year - 2000; i++) {
             scheduleList.push.apply(
               scheduleList,
-              that.returnScheduleList(2020 + i)
+              that.returnScheduleList(2000 + i)
             );
           }
+          this.getPagination(scheduleList);
+
           // 第一次加载
           console.log(scheduleList);
-          const finalDate = new Date();
           that.setData({
-            scheduleList: scheduleList,
-            todayStr: finalDate.toLocaleDateString(),
+            scheduleList: scheduleList.slice(this.firstPage * this.pageSize, this.currentPage * this.pageSize),
+            todayStr: currentDate,
             thisYear: year,
             maxYear: year
           });
+          console.log(this.data.scheduleList)
         }
       );
       that.setData({
@@ -74,7 +96,7 @@ create.Page({
       });
     });
   }, 1000),
-  nextDetail: throttle(function(e) {
+  nextDetail: throttle(function (e) {
     let item = e.target.dataset.item;
     dd.navigateTo({
       url: `./../meetingDetail/meetingDetail?scheduleItem=${JSON.stringify(
@@ -237,7 +259,7 @@ create.Page({
           );
         }
       });
-      scheduleMap.forEach(function(value, key, map) {
+      scheduleMap.forEach(function (value, key, map) {
         scheduleList.push(value);
       });
       return scheduleList;
@@ -309,7 +331,7 @@ create.Page({
     // 第一个月的第一天
     let listWeek = new Date(year, 0, 1).getDay() === 0 ? 1 : 2;
     let thisDay = new Date().toLocaleDateString();
-    DateMap.forEach(function(value, key, map) {
+    DateMap.forEach(function (value, key, map) {
       const keyDate = new Date(key);
       if (keyDate.getMonth() === 0 && keyDate.getDate() === 1) {
         DateList.push({
@@ -337,7 +359,7 @@ create.Page({
           value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
             rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
             }${rangeDay2}日`,
-          dayStr: `${keyDate.getFullYear()}/${rangeMonth1 +
+          dateStr: `${keyDate.getFullYear()}/${rangeMonth1 +
             1}/${rangeDay1}-week`
         });
         listWeek += 1;
@@ -413,15 +435,40 @@ create.Page({
     return date;
   },
   lower() {
-    let year = this.data.maxYear + 1;
-    let DateList = this.returnScheduleList(year);
-    let scheduleList = this.data.scheduleList;
-    scheduleList.push.apply(DateList);
+    // let year = this.data.maxYear + 1;
+    // let DateList = this.returnScheduleList(year);
+    // let scheduleList = this.data.scheduleList;
+    // scheduleList.push.apply(DateList);
+    // this.setData({
+    //   scheduleList,
+    //   maxYear: year
+    // });
+    if (this.currentPage < this.totalPages) {
+      this.currentPage++;
       this.setData({
-      scheduleList,
-      maxYear: year
+        scheduleList: this.scheduleList.slice(this.firstPage * this.pageSize, this.currentPage * this.pageSize)
       });
+      console.log(this.data.scheduleList)
+    }
   },
+  upper: throttle(function () {
+    console.log(this.firstPage);
+    if (this.firstPage > 0) {
+      this.firstPage--;
+      this.setData({
+        scheduleList: this.scheduleList.slice(this.firstPage * this.pageSize, this.currentPage * this.pageSize)
+      });
+      this.setData({
+        todayStr: ''
+      }, () => {
+        this.setData({
+          todayStr: this.scheduleList[(this.firstPage + 1) * this.pageSize - (this.pageSize / 2)].dateStr
+        })
+      })
+      console.log(this.scheduleList[this.firstPage * this.pageSize - (this.pageSize / 2)].dateStr)
+      console.log(this.data.scheduleList)
+    }
+  }),
   nextPage() {
     dd.navigateTo({ url: "./../createMeeting/createMeeting" });
   },