商品列表组件优化

src/pages/home/index.vue

@@ -453,7 +453,7 @@ export default {
   // 滚动节流方法
   onPageScroll: tool.throttle(function (el) {
     // console.log(el);
-    this.scrolls(el)
+    this.scrolls(el[0])
   },200),
 
   methods: {

static/nativeComponents/GoodsList/index.js

@@ -236,8 +236,9 @@ const componentOptions = {
         this.setData({ classificationLoadPage, loading });
         let query = {
           categoryId: this.data.datas.componentData.categoryId,
-          page: this.showRowNum() ? classificationLoadPage : 1,
-          rows: this.data.datas.componentData.classificationLoadNum,
+          page: classificationLoadPage,
+          // rows: this.data.datas.componentData.classificationLoadNum,
+          rows: this.showRowNum() ? this.data.classificationLoadNum : this.getItemNum(),
           sortColumn: goodsSort,
           sortType: goodsSort != 2 ? 1 : 0,
           whetherShowSoldOutGoods: this.data.datas.componentData
@@ -275,7 +276,7 @@ const componentOptions = {
             } else {
               goodsList = [...goodsList, ...goodsLists];
             }
-            if (goodsLists && goodsLists.length < 10) {
+            if (goodsLists && goodsLists.length < query.rows) {
               this.setData({ finished: true });
             }
             this.goodsListVal(goodsList, type);
@@ -529,6 +530,13 @@ const componentOptions = {
       return new Date(val.replace(/-/g, "/")).getTime() - new Date().getTime();
     },
     getItemNum() {
+      if(this.data.datas.componentData['goodsSource'] == 'classify') {
+        return this.data.classificationLoadNum
+      }
+      // 瀑布流模式默认查6条
+      if(this.data.datas.componentData.style == "waterfall" && this.data.datas.componentData["goodsSource"] == "specifyFilter"){
+        return 6;
+      }
       //数量
       if (
         this.data.datas.componentData.style === "list" &&
@@ -599,7 +607,7 @@ const componentOptions = {
       console.log('goodsSource, moreShow, style',goodsSource, moreShow, style);
       this.lazyloading()
       if (
-        goodsSource == "classify" &&
+        (goodsSource == "classify" || goodsSource == "specifyFilter") &&
         moreShow == false &&
         style == "waterfall"
       ) {

static/nativeComponents/module/WaterfallFlow/index.js

@@ -158,6 +158,7 @@ Component({
       );
     },
     getScroll(el) {
+      console.log(el,'--------------161')
       let { finished } = this.properties;
       let _this = this;
       _this
@@ -168,6 +169,7 @@ Component({
             let scrollTop = parseInt(el.scrollTop);
             let domHeight = parseInt(res.height);
             // 窗口高度+滚动高度等于 = 元素整体高度 -(预留一段距离加载) 触发父组件查询接口
+            console.log(scrollTop,finished,'--------------finished')
             if (
               scrollTop + _this.data.clientHeight >= domHeight - 150 &&
               finished == false