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

ccbikai
Commit fac03b1a682bc8d4ac8f0694a0419969eae2cbff 2 parents 09aa19d4 3c82ca4f
Showing 1 changed file with 1 additions and 1 deletions
apps/channel/models/brand.js
--- a/apps/channel/models/brand.js
View file @fac03b1
+++ b/apps/channel/models/brand.js
View file @fac03b1
@@ -55,7 +55,7 @@ const getBrandListData = params => {
     let finalResult = {};
 
     return brandApi.getBrandListOriginData(params).then(result => {
-         if (result.data) {
+         if (result && result.data) {
             Object.assign(finalResult, handleBrandList(result.data.all_list));
         }