Authored by 周少峰

Merge branch 'hotfix/shopTrendImg' into hotfix/saleBrandList

... ... @@ -632,7 +632,7 @@ const getShopData = (shopId, channel, params, shopInfo) => {
_.forEach(prodList, value => {
list[value.product_skn] = {
img: helpers.getForceSourceUrl(value.default_images) +
'?imageView/1/w/{width}/h/{height}',
'?imageView2/1/w/{width}/h/{height}',
title: value.product_name,
price: ${value.sales_price}`
};
... ...
... ... @@ -563,7 +563,10 @@ exports.getSaleSpecialData = (id, params, channel) => {
if (!_.isEmpty(result[1])) {
resData.leftContent = searchHandler.handleSortData(_.get(result[1],
'data.sort', []), defaultParam);
'data.sort', []), Object.assign({
msort: params.msort || '',
misort: params.misort || ''
}, defaultParam));
}
if (!_.isEmpty(result[2])) {
... ...