首页优化加载更多

@@ -120,11 +120,7 @@ Page({
         'content-type': 'application/json',
         'x-wx-skey': skey
       },
-      // ,job_opportunities
       data: {
-        // contentType: 'career_advice,academic_conference,job_opportunities',
-        // offset: 0,
-        // limit: 8
       },
       success: function (res) {
         console.log('session', res.data)
@@ -167,17 +163,6 @@ Page({
           list: res.data.data,
           num: res.data.data.length
         })
-        // if (res.data.data.length < 8) {
-        //   that.setData({
-        //     list: res.data.data,
-        //   })
-        // } else {
-        //   var num1 = that.data.num + 8;
-        //   that.setData({
-        //     list: res.data.data,
-        //     num: num1
-        //   })
-        // }
       }
 
     })
@@ -189,22 +174,11 @@ Page({
         'x-wx-skey': skey
       },
       success: function (res) {
-        console.log('adv', res.data)
         that.setData({
           adv: res.data.data
         })
       }
     })
-    // wx.getSystemInfo({
-    //   success: function (res) {
-    //     that.setData({
-    //       screenHeight: res.windowHeight,
-    //       screenWidth: res.windowWidth,
-    //     });
-    //   }
-    // })
-
-
 
     setTimeout(function () {
       that.setData({
@@ -215,72 +189,18 @@ Page({
 
     this.queryMultipleNodes()
   },
-  // imageLoad: function (e) {
-  //   console.log('asdasfsdfg',e)
-  //   var that = this;
-  //   var $width = e.detail.width,    //获取图片真实宽度  
-  //     $height = e.detail.height,
-  //     ratio = $width / $height;   //图片的真实宽高比例  
-  //   var viewWidth = 750,           //设置图片显示宽度，  
-  //     viewHeight = 750 / ratio;    //计算的高度值     
-  //   that.setData({
-  //     imgwidth: viewWidth,
-  //     imgheight: viewHeight
-  //   })
-  // },
   scroll: function (e) {
-    console.log('aa', e)
-    // console.log(e.detail.scrollTop);
     var that = this
     var num = that.data.num
 
-    // that.setData({
-    //   scrollTop: e.detail.scrollTop
-    // })
     var scrollTop = e.detail.scrollTop
-    // console.log('scrollTop1111', scrollTop)
+
     that.setData({
       scrollTop: scrollTop
     })
 
 
     if (scrollTop == 0) {
-      // var that = this
-      // var skey = that.data.skey
-      // wx.request({
-      //   url: app.url + '/mpapi/1.0.0/homepage/content?contentType=&offset=&limit=',
-      //   method: 'GET',
-      //   header: {
-      //     'content-type': 'application/json',
-      //     'x-wx-skey': skey
-      //   },
-      //   // ,job_opportunities
-      //   data: {
-      //     contentType: 'career_advice,academic_conference,job_opportunities',
-      //     offset: 0,
-      //     limit: 8
-      //   },
-      //   success: function (res) {
-      //     console.log('list', res.data)
-      //     wx.showLoading({
-      //       title: '加载中',
-      //     })
-      //     that.setData({
-      //       list: res.data.data,
-      //       num: 0
-      //     })
-      //     wx.showLoading({
-      //       title: '加载中',
-      //     })
-      //     setTimeout(function () {
-      //       var scrollTop1 = that.data.scrollTop1
-      //       that.setData({
-      //         scrollTop1: 60
-      //       })
-      //       wx.hideLoading()
-      //     }, 2000)
-      //   }
-      // })
       var index1 = that.data.index1
       var xiala = that.data.xiala
       that.setData({
@@ -300,8 +220,6 @@ Page({
 
       that.onLoad();
     }
-    // console.log('e.detail.scrollTop:'+e.detail.scrollTop) ;
-    // console.log('scrollTop:'+scrollTop)
   },
   getmenu: function () {
     var that = this
@@ -354,17 +272,14 @@ Page({
   },
 
   checktime: function () {
-    console.log(1111111)
     var that = this
     var time = Date.parse(wx.getStorageSync('time'))
-    console.log(2222222)
+
     var time1 = Date.parse(new Date)
     var gettime = (time1 - time) / 1000;
     if (gettime > 1) {
-      console.log(999999)
       return false
     } else {
-      console.log(8888888)
       return true
     }
   },
@@ -400,11 +315,8 @@ Page({
       o = t.target.dataset.type,
       i = {},
       s = this;
-    console.log('o', 0)
     wx.getSystemInfo({
       success: function (t) {
-        console.log('t', t)
-        console.log('e', e)
         i[o] = t.windowWidth / a * e,
           (!s.data[o] || s.data[o] && i[o] < s.data[o]) && s.setData(i)
       }
@@ -417,7 +329,7 @@ Page({
     var con = that.data.con
     var index = e.currentTarget.dataset.index
     var skey = that.data.skey
-    console.log('index', index)
+
     var index1 = that.data.index1
     that.setData({
       index1: index + 1,
@@ -437,14 +349,15 @@ Page({
           limit: 8
         },
         success: function (res) {
-          console.log('con', res.data.data)
+          if (res.data.data.length < 8) {
+            that.setData({
+              xiala: false,
+            })
+          }
           that.setData({
             list: res.data.data,
             num: res.data.data.length,
-            scrollTop1: 320,
-
-            xiala: true
-            // url:'../recruit/recruit?id:id'
+            scrollTop1: 320
           })
         }
       })
@@ -463,12 +376,15 @@ Page({
           limit: 8
         },
         success: function (res) {
-          console.log('con', res.data.data)
+          if (res.data.data.length < 8) {
+            that.setData({
+              xiala: false,
+            })
+          }
           that.setData({
             list: res.data.data,
             num: res.data.data.length,
-            scrollTop1: 320,
-            xiala: true
+            scrollTop1: 320
           })
         }
       })
@@ -487,12 +403,15 @@ Page({
           limit: 8
         },
         success: function (res) {
-          console.log('con', res.data.data)
+          if (res.data.data.length < 8) {
+            that.setData({
+              xiala: false,
+            })
+          }
           that.setData({
             list: res.data.data,
             num: res.data.data.length,
-            scrollTop1: 320,
-            xiala: true
+            scrollTop1: 320
           })
         }
       })