分页

pages/index/index.js

@@ -25,7 +25,7 @@ Page({
     total_sub:0,
     cycleId: 'day',
     value: ['日榜','周榜','月榜'],
-    select:1,
+    select:0,
     day:'',
     week:'',
     month: '',
@@ -34,7 +34,9 @@ Page({
     sub_value:0,
     week_h:0,
     casci_list:[],
-    page_csi:1
+    page_csi:1,
+    total_csi: 0,
+    yestoday:''
   },
 
 
@@ -44,7 +46,8 @@ Page({
     d = d > 9 ? d : '0' + d;
     this.setData({
       day:y+'-'+m+'-'+d,
-      month: y + '-' + m
+      month: y + '-' + m,
+      yestoday: y + '-' + m + '-' + (d-1)
     })
     this.getTimer()
     if (this.data.uid){
@@ -81,7 +84,10 @@ Page({
   onTabItemClick: function onTabItemClick(e) {
     var id = e.currentTarget.dataset.tabs;
     this.setData({
-      select:id
+      select:id,
+      page_csi:1,
+      total_csi:0,
+      casci_list:[]
     })
     this.getcasci()
   },
@@ -91,14 +97,18 @@ Page({
     this.setData({
       m_value: id
     })
-    this.getcasci()
+    
   },
   monthSelect: function () {
     var week=this.data.columns[this.data.m_value]
     this.setData({
       week: week,
-      show_month:0
+      show_month:0,
+      page_csi: 1,
+      total_csi: 0,
+      casci_list: []
     })
+    this.getcasci()
   },
   open: function () {
     this.setData({
@@ -114,21 +124,30 @@ Page({
   // 日榜
   bindDateChange:function(e){
     this.setData({
-      day: e.detail.value
+      yestoday: e.detail.value,
+      page_csi: 1,
+      total_csi: 0,
+      casci_list: []
     })
     this.getcasci()
   },
   //领域期刊
   subChange:function(e){
     this.setData({
-      sub_value: e.detail.value
+      sub_value: e.detail.value,
+      page_csi: 1,
+      total_csi: 0,
+      casci_list: []
     })
     this.getcasci()
   },
   //月榜
   bindDateChange1: function (e) {
     this.setData({
-      month: e.detail.value
+      month: e.detail.value,
+      page_csi: 1,
+      total_csi: 0,
+      casci_list: []
     })
     this.getcasci()
   },
@@ -200,6 +219,17 @@ Page({
         this.getsub()
     }
     
+  },
+  //指数下一页
+  next_csi: function () {
+    if (this.data.casci_list.length < this.data.total_csi) {
+      const page = this.data.page_csi + 1
+      this.setData({
+        page_csi: page
+      })
+      this.getcasci()
+    }
+
   },
   //获取所有数据
   getData:function(flag){
@@ -247,7 +277,7 @@ Page({
         if (res.data.code == 0) {
           const list = res.data.data.list;
           list.unshift({
-            name:'请选择期刊',
+            name:'请选择领域',
             id:''
           })
           this.setData({
@@ -265,12 +295,10 @@ Page({
   //指数
   getcasci:function(){
     wx.showNavigationBarLoading()
-    this.setData({
-      casci_list: []
-    })
+    const casci_list = this.data.casci_list;
     var subject_id=this.data.sub_list[this.data.sub_value].id,date='';
     if (this.data.select == 0){
-      date = this.data.day
+      date = this.data.yestoday
     }
     if (this.data.select == 1) {
       date = this.data.week.replace('至',',')
@@ -285,15 +313,19 @@ Page({
         uid: this.data.uid,
         date: date,
         signup_id: subject_id,
-        // page:this.data.page_csi,
+        page:this.data.page_csi,
         // page_size:20
       },
       success: res => {
         wx.hideNavigationBarLoading()
         if (res.data.code == 0) {
           const list = res.data.data[1];
+          for (let i = 0; i < list.length; i++) {
+            casci_list.push(list[i])
+          }
           this.setData({
-            casci_list: list
+            casci_list: casci_list,
+            total_csi: res.data.data[0]
           })
         }
 
@@ -527,7 +559,8 @@ Page({
       SundayTime = nowTime + (7 - day) * oneDayTime; //显示当前周日
     }
     let list = [...new Set(setlist)] // 简单去重一下
-    // console.log(list);
+    list.shift()
+    console.log(list);
     this.setData({
       columns: list,
       week: list[0]

pages/index/index.wxml

@@ -109,8 +109,8 @@
         </view>
         <view class="date">
             <view class="day" wx:if='{{select==0}}'>
-              <picker bindchange="bindDateChange" mode='date' 
-              value="{{day}}">{{day}}</picker>
+              <picker bindchange="bindDateChange" mode='date'  end='{{yestoday}}'
+              value="{{yestoday}}">{{yestoday}}</picker>
             </view>
             <view class="day" bindtap="open" wx:if='{{select==1}}'>{{week}}</view>
             <view class="day" wx:if='{{select==2}}'>
@@ -118,7 +118,7 @@
                 value="{{month}}">{{month}}</picker>
               </view>
         </view>
-        <scroll-view scroll-y="true" style="height: calc(100vh - 660rpx);">
+        <scroll-view scroll-y="true" bindscrolltolower='next_csi' style="height: calc(100vh - 660rpx);">
             <navigator url="../number/number?id={{item.journal_id}}" class="num_list" wx:for='{{casci_list}}'>
               <view class="order" wx:if='{{index <= 2}}'>
                 <image src="{{'../images/t'+(index+1)+'.png'}}"></image>
@@ -131,6 +131,11 @@
                 <text style="color:#0077FF;">{{item.casci}}</text>
               </view>
             </navigator>
+            <block wx:if='{{total_csi>=20}}'>
+            <view class='more' wx:if='{{casci_list.length < total_csi}}'>上拉加载更多...</view>
+            <view class='more' wx:else>已加载全部数据！</view>
+            </block>
+            <view wx:if='{{total_csi<=0}}' style="color:#999;margin:100rpx 0;text-align:center;">暂无期刊！</view>
         </scroll-view>
         
     </scroll-view>

pages/index/index.wxss

@@ -429,4 +429,6 @@ scroll-view{
 .order image{
   width: 40rpx;
   height: 40rpx;
+  position: relative;
+  top: 4rpx;
 }

pages/number/number.js

@@ -29,7 +29,7 @@ Page({
     m = m > 9 ? m : '0' + m;
     d = d > 9 ? d : '0' + d;
     this.setData({
-      day: y + '-' + m + '-' + d
+      day: y + '-' + m + '-' + (d-1)
     })
     // options.id=2;
     wx.showNavigationBarLoading()