Authored by yyq

Merge branch 'hotfix/brandSaleBug' into release/4.6

... ... @@ -229,10 +229,6 @@ exports.handleOutletsActivityData = (origin, name) => {
dest.topic.push(activity);
});
if (!dest.length) {
return false;
}
return dest;
};
... ...
... ... @@ -172,7 +172,7 @@ exports.getOutletsChannelData = (params, channel) => {
}
// 限时嗨购
if (result[2].code === 200) {
if (result[2].code === 200 && !_.isEmpty(result[2].data)) {
channelData.nearOver = outletsProcess.handleOutletsActivityData(result[2].data, '限时嗨购');
}
... ...
... ... @@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2016-06-02 15:50:47
* @Last Modified by: Targaryen
* @Last Modified time: 2016-06-22 17:32:39
* @Last Modified time: 2016-06-22 18:36:26
*/
'use strict';
... ... @@ -498,6 +498,9 @@ exports.handleSaleFilterData = (origin, params) => {
if (!_.isEmpty(origin.priceRange)) {
_.forEach(origin.priceRange, (value, key) => {
if (params.price === key) {
priceRangechecked = true;
}
let price = {
checked: params.price === key,
href: handleFilterUrl(params, { price: key }),
... ...