Authored by 毕凯

Merge branch 'hotfix/sale' into 'gray'

SALE-FROM



See merge request !1018
... ... @@ -241,9 +241,13 @@ let filter = (req, res, next) => {
* @return {[type]}
*/
let search = (req, res, next) => {
let params = req.query; // tar modified 161121 safe
let params = req.query;
let uid = req.user.uid || 0;
if (params.from === 'seckill') {
uid = 0; // 秒杀无须用户信息
}
// 断码区域必须传尺码
if (params.saleType === '1' && (!params.breakSort || !params.breakSize)) {
return res.render('sale/product', {
... ...
... ... @@ -2,7 +2,6 @@
* @Author: Targaryen
* @Date: 2017-04-21 13:36:34
* @Last Modified by: Targaryen
* @Last Modified time: 2017-04-21 14:17:40
*/
const $ = require('yoho-jquery');
... ... @@ -42,7 +41,8 @@ const loadGoodsList = () => {
data: {
yh_channel: channel,
page: page++,
isApp: yoho.isApp
isApp: yoho.isApp,
from: 'seckill'
},
complete: function() {
onSearching = false;
... ...