Authored by biao

Merge branch 'release/4.6' of http://git.yoho.cn/fe/yohobuywap-node into release/4.6

... ... @@ -11,14 +11,14 @@ const mRoot = '../models';
const headerModel = require('../../../doraemon/models/header');
const saleModel = require(`${mRoot}/sale`);
const queryParam = {
brand: '0',
gender: '1,2,3',
sort: '0',
size: '0',
price: '0',
pD: '0.1,0.9'
};
// const queryParam = {
// brand: '0',
// gender: '1,2,3',
// sort: '0',
// size: '0',
// price: '0',
// pD: '0.1,0.9'
// };
/**
* 公共数据处理
... ... @@ -57,7 +57,7 @@ exports.index = (req, res, next) => {
let params = processPublicData(req, 'SALE', 'sale');
saleModel.getSaleData(params.channel).then((result) => {
res.render('sale/index', Object.assign(params.renderData, queryParam, {
res.render('sale/index', Object.assign(params.renderData, {
content: result,
floorHeader: {
title: {
... ...
... ... @@ -27,9 +27,10 @@ const typeCont = {
price: ['s_p_desc', 's_p_asc'],
discount: ['p_d_desc', 'p_d_asc'],
sale: ['s_n_desc', 's_n_asc'],
newest: ['s_t_desc,s_s_desc', 's_t_asc,s_s_asc'],
// newest: ['s_t_desc', 's_t_asc'],
// newest: ['s_t_desc,s_s_desc', 's_t_asc,s_s_asc'],
newest: ['s_t_desc', 's_t_asc'],
stock: ['s_s_desc', 's_s_asc'],
all: ['d_s_desc', 'd_s_asc']
};
... ...