merge feature/brandsTree

@@ -159,7 +159,12 @@ const _getBrandListOriginData = (channel) => {
         code: 200,
         code: 200,
         cache: true
         cache: true
     }).then(result => {
     }).then(result => {
-        return Object.assign(finalResult, handleBrandList(result.data.all_list));
+        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]) {
         if (result[1]) {
             _.forEach(result[1], function(data) {
             _.forEach(result[1], function(data) {
-                if (data.focus_type === '1') {
+                if (data.focus_type && data.focus_type === '1') {
                     //brandList.bannerTop = _dealBrandUrl(data);
                     //brandList.bannerTop = _dealBrandUrl(data);
                     brandList.bannerTop = 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 = _dealBrandUrl(data).data;
                     brandList.focusData = 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]) {
         if (result[0]) {
             _.forEach(result[0], function(data) {
             _.forEach(result[0], function(data) {
-                if (data.focus_type === '1') {
+                if (data.focus_type && data.focus_type === '1') {
                     //brandList.bannerTop = _dealBrandUrl(data);
                     //brandList.bannerTop = _dealBrandUrl(data);
                     brandList.bannerTop = 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 = _dealBrandUrl(data).data;
                     brandList.focusData = data.data;
                     brandList.focusData = data.data;
+                } else if (data.template_intro === '一张图片') {
+                    brandList.bannerTop = data;
                 }
                 }
             });
             });
         }
         }