Merge branch 'feature/installmentBigData' into 'release/5.7'

取消下拉刷新



See merge request !554

@@ -158,7 +158,6 @@ const getInstallmentGoods = (req, res, next) => {
     res.setHeader('Access-Control-Allow-Credentials', 'true');
 
     let params = {
-        page: req.query.page,
         uid: req.user.uid
     };
 

@@ -8,7 +8,8 @@ let $ = require('yoho-jquery'),
     ellipsis = require('yoho-mlellipsis'),
     cookie = require('yoho-cookie'),
     Swiper = require('yoho-swiper'),
-    ListData = require('./installment-goods'),
+
+    // ListData = require('./installment-goods'),
     bp = require('./burying-point'),
     PullRefresh = require('plugin/pull-refresh'),
     uuid = require('uuid');
@@ -31,17 +32,19 @@ let installment = {
 
         if (self.$isOpen.val() === 'true') {
             self.iscrollAction();
-        } else {
-
-            // 商品列表翻页加载数据
-            new ListData({
-                url: '/home/installment/get-goods',
-                page: 1,
-                boxArea: $('#goods-list'),
-                uuid: self.uuidVal
-            });
         }
 
+        // 5.7分期推荐商品没有分页
+        // else {
+        //     // 商品列表翻页加载数据
+        //     new ListData({
+        //         url: '/home/installment/get-goods',
+        //         page: 1,
+        //         boxArea: $('#goods-list'),
+        //         uuid: self.uuidVal
+        //     });
+        // }
+
         if (self.cookieTab) {
             self.$tab.eq(self.cookieTab).addClass('on').siblings().removeClass('on');
             self.$installmentCont.hide().eq(self.cookieTab).fadeIn();

@@ -263,7 +263,7 @@ exports.processFilter = (list, options) => {
             title: '折扣',
             dataId: 'key',
             subsName: 'name',
-            firstSub: '0.1,0.9',
+            firstSub: '0,1',
             dataType: 'p_d',
             sortNum: '7'
         },