Merge branch 'develop' into release/1.0

郭成尧
Commit aad128b7f6e4c69e0c46ddd694c5f44e6a5ca75a 2 parents c25f7177 abbc87d3
Showing 1 changed file with 2 additions and 2 deletions
apps/channel/models/brand.js
--- a/apps/channel/models/brand.js
View file @aad128b
+++ b/apps/channel/models/brand.js
View file @aad128b
@@ -62,10 +62,10 @@ const getBrandListData = params => {
     let finalResult = {};
 
     return api.all([brandApi.getBrandListOriginData(params)]).then(result => {
-         if (result[0].code === 200 && result[0].data.all_list) {
+         if (result[0].code === 200 && result[0].data) {
             Object.assign(finalResult, handleBrandList(result[0].data.all_list));
         } else {
-             logger.error('getBrandListOriginData api code no 200 or allList is null');
+             logger.error('getBrandListOriginData api code no 200 or data is null');
         }
 
         return finalResult;