Authored by 周少峰

Merge branch 'hotfix/saleDiscount'

... ... @@ -371,7 +371,8 @@ exports.getSaleDiscountData = (params, channel) => {
limit: '1',
productPool: result[1].data[0].product_pool
}),
saleApi.getSaleGoodsList(Object.assign(_.update(params, 'channel', null), {
saleApi.getSaleGoodsList(Object.assign({}, params, {
channel: null,
productPool: result[1].data[0].product_pool
}))
]).then(subResult => {
... ... @@ -564,9 +565,9 @@ exports.getSaleSpecialData = (id, params, channel) => {
if (!_.isEmpty(result[1])) {
resData.leftContent = searchHandler.handleSortData(_.get(result[1],
'data.sort', []), Object.assign({
msort: params.msort || '',
misort: params.misort || ''
}, defaultParam));
msort: params.msort || '',
misort: params.misort || ''
}, defaultParam));
}
if (!_.isEmpty(result[2])) {
... ...
... ... @@ -51,6 +51,7 @@ $shopFavor.on('click', function() {
}).then(function(res) {
if (res.code === 200) {
$shopFavor.find('i').toggleClass('coled');
isFavorite = !isFavorite;
} else if (res.code === 401) {
location.href = '//www.yohobuy.com/signin.html?refer=' + encodeURIComponent(location.href);
}
... ...