Authored by yyq

Merge branch 'release/4.6'

... ... @@ -63,11 +63,9 @@ const handleOutletsGoodsMenuData = (origin, params) => {
misort: []
};
var oldParam = _.cloneDeep(params);
_.forEach(origin, subValue => {
let oldParam = _.cloneDeep(params);
let goodsmenu = {};
let urlSuffix = {};
goodsmenu.name = subValue.categoryName;
... ... @@ -77,7 +75,8 @@ const handleOutletsGoodsMenuData = (origin, params) => {
if (!_.isEmpty(urlSuffix.msort) && urlSuffix.msort === oldParam.msort && urlSuffix.misort === oldParam.misort) {
goodsmenu.cur = true;
}
delete oldParam.msort;
delete oldParam.misort;
if (urlSuffix.msort) {
Object.assign(oldParam, {msort: urlSuffix.msort});
dest.msort.push(urlSuffix.msort);
... ...
... ... @@ -85,9 +85,9 @@ exports.getOutletsIndexData = (params, channel) => {
return finalResult;
}
// 获取底部商品数据
if (!params.msort || !params.misort) {
if (!params.msort && !params.misort) {
Object.assign(
params,
{msort: _.uniq(finalResult.goodsBoard.goodsMenu.msort).join()}
... ...
... ... @@ -654,7 +654,8 @@
line-height: 20px;
color: #fff;
font-style: italic;
margin-top: -3px;
position: relative;
top: -3px;
margin-right: 5px;
margin-left: 10px;
padding-right: 5px;
... ...