fe / yohobuywap-node · Commits

Go to a project

Authored by zhangxiaoru
Commit 30ab3b96a4f991a6e0038dd1114fe020fa875548 2 parents d7a2bfd8 fec440c1

merge feature/brandsTree

Inline Side-by-side
Showing 1 changed file with 13 additions and 4 deletions
... ... @@ -159,7 +159,12 @@ const _getBrandListOriginData = (channel) => {
code: 200,
cache: true
}).then(result => {
if (result.data && result.data.all_list) {
return Object.assign(finalResult, handleBrandList(result.data.all_list));
} else {
return {};
}
});
};
... ... @@ -240,12 +245,14 @@ const indexData = (gender, brandCode, cateCode) => {
if (result[1]) {
_.forEach(result[1], function(data) {
if (data.focus_type === '1') {
if (data.focus_type && data.focus_type === '1') {
//brandList.bannerTop = _dealBrandUrl(data);
brandList.bannerTop = data;
} else if (data.focus_type === '2') {
} else if (data.focus_type && data.focus_type === '2') {
//brandList.focusData = _dealBrandUrl(data).data;
brandList.focusData = data.data;
} else if (data.template_intro === '一张图片') {
brandList.bannerTop = data;
}
});
}
... ... @@ -288,12 +295,14 @@ const brandListData = (code, gender) => {
if (result[0]) {
_.forEach(result[0], function(data) {
if (data.focus_type === '1') {
if (data.focus_type && data.focus_type === '1') {
//brandList.bannerTop = _dealBrandUrl(data);
brandList.bannerTop = data;
} else if (data.focus_type === '2') {
} else if (data.focus_type && data.focus_type === '2') {
//brandList.focusData = _dealBrandUrl(data).data;
brandList.focusData = data.data;
} else if (data.template_intro === '一张图片') {
brandList.bannerTop = data;
}
});
}
... ...