Authored by yyq

Merge branch 'feature/1215' into release/6.9.17

@@ -29,7 +29,7 @@ exports.productLst = function(req, res, next) { @@ -29,7 +29,7 @@ exports.productLst = function(req, res, next) {
29 let params = { 29 let params = {
30 uid: uid, 30 uid: uid,
31 udid: udid, 31 udid: udid,
32 - limit: 20 32 + limit: req.query.limit || 20,
33 }; 33 };
34 34
35 keys.forEach(function(k) { 35 keys.forEach(function(k) {
@@ -38,10 +38,6 @@ exports.productLst = function(req, res, next) { @@ -38,10 +38,6 @@ exports.productLst = function(req, res, next) {
38 } 38 }
39 }); 39 });
40 40
41 - if (req.query.limit < 100) {  
42 - params.limit = req.query.limit;  
43 - }  
44 -  
45 getProductList = req.ctx(model).ufoProductList(params); 41 getProductList = req.ctx(model).ufoProductList(params);
46 } else { 42 } else {
47 let keys = ['sort', 'misort', 'msort', 'gender', 'brand'], 43 let keys = ['sort', 'misort', 'msort', 'gender', 'brand'],