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

开发完成，修改默认参数，请求增加gender



See merge request !534

@@ -18,13 +18,13 @@ const qs = require('querystring');
 // 新品到着(blk)
 // 新品到着(blk)
 const blkNewGoods = (req, res, next) => {
 const blkNewGoods = (req, res, next) => {
     let params = Object.assign({
     let params = Object.assign({
-        isblknew: true
+        isblknew: true,
+        gender: req.query.gender || '1,3'
     }, req.query);
     }, req.query);
 
 
     // 获取第一页数据做服务端渲染
     // 获取第一页数据做服务端渲染
     let uid = req.user.uid || 0;
     let uid = req.user.uid || 0;
     let initialData = _.assign({
     let initialData = _.assign({
-        gender: req.query.gender || '1,3',
         type: 'default',
         type: 'default',
         order: '0',
         order: '0',
         page: 1,
         page: 1,

@@ -168,7 +168,11 @@ const _searchGoods = (params) => {
     if (params.isblknew) {
     if (params.isblknew) {
         method = 'app.search.newProduct';
         method = 'app.search.newProduct';
         params.app_type = 1;
         params.app_type = 1;
+        if (params.type === 'default') {
+            params.order = 's_t_asc';
+        }
     }
     }
+
     if (params.promotion_id) {
     if (params.promotion_id) {
         method = 'app.search.promotion';
         method = 'app.search.promotion';
     }
     }