Authored by ccbikai

Merge branch 'release/1.0' of git.yoho.cn:fe/yohoblk-wap into release/1.0

@@ -62,10 +62,10 @@ const getBrandListData = params => { @@ -62,10 +62,10 @@ const getBrandListData = params => {
62 let finalResult = {}; 62 let finalResult = {};
63 63
64 return api.all([brandApi.getBrandListOriginData(params)]).then(result => { 64 return api.all([brandApi.getBrandListOriginData(params)]).then(result => {
65 - if (result[0].code === 200 && result[0].data.all_list) { 65 + if (result[0].code === 200 && result[0].data) {
66 Object.assign(finalResult, handleBrandList(result[0].data.all_list)); 66 Object.assign(finalResult, handleBrandList(result[0].data.all_list));
67 } else { 67 } else {
68 - logger.error('getBrandListOriginData api code no 200 or allList is null'); 68 + logger.error('getBrandListOriginData api code no 200 or data is null');
69 } 69 }
70 70
71 return finalResult; 71 return finalResult;