update for process data

@@ -39,7 +39,7 @@ const channelMap = {
 };
 
 const getBannerList = data => {
-    let l = [];
+    let list = [];
 
     _.forEach(data, (bannerData) => {
         let obj = {};
@@ -48,12 +48,27 @@ const getBannerList = data => {
         obj.img = bannerData.src;
         obj.name = bannerData.title;
 
-        l.push(obj);
+        list.push(obj);
     });
 
-    return l;
+    return list;
 };
 
+const getadbannerData = data => {
+    let obj = {
+        adbanner: {
+            href: '',
+            img: '',
+            name: ''
+        }
+    };
+
+    obj.adbanner.href = data.url;
+    obj.adbanner.img = data.src;
+    obj.adbanner.name = data.title;
+
+    return obj;
+};
 
 const getSlideData = srcData => {
     let slideData = {
@@ -116,12 +131,10 @@ const getNewReportFloorData = args => {
     floorDatas.push(data);
 
     if (forthItem.template_name === 'single_image') {
-        console.log(forthItem);
         adData = getadbannerData(forthItem.data[0]);
         floorDatas.push(adData);
     }
 
-
     return floorDatas;
 };
 
@@ -227,15 +240,16 @@ const getSingleHotFloorData = args => {
         let obj = {};
 
         if (i === 1) {
-            //val = data[index + 1].data[0]; // 第二个是大图
+            // val = data[index + 1].data[0]; // 第二个是大图
             val = args[0].data[0]; // 第二个是大图
         } else if (i === len - 1) {
-            //val = data[index + 1].data[1]; // 最后一个是大图
+            // val = data[index + 1].data[1]; // 最后一个是大图
         } else {
             if (pos > 1) { // 小图
                 pos = pos - 1;
             }
-            //val = data[index + 2].data[pos];
+
+            // val = data[index + 2].data[pos];
             val = args[1].data[pos];
         }
         obj.href = val.url;
@@ -254,21 +268,7 @@ const getSingleHotFloorData = args => {
     return floorDatas;
 };
 
-const getadbannerData = data => {
-    let obj = {
-        adbanner: {
-            href: '',
-            img: '',
-            name: ''
-        }
-    }
-
-    obj.adbanner.href = data.url;
-    obj.adbanner.img = data.src;
-    obj.adbanner.name = data.title;
 
-    return obj;
-};
 
 const requestContent = type => {
 
@@ -308,9 +308,11 @@ const processFloorData = rawData => {
                         floorMap[data.data.text].call(null, rawData.slice(index + 1, index + 5));
         }
 
-        _.isNil(floorData) ? null : _.isArray(floorData) ?
-            floorList = floorList.concat(floorData) :
-            floorList.push(floorData);
+        if (!_.isNil(floorData)) {
+            _.isArray(floorData) ?
+                floorList = floorList.concat(floorData) :
+                floorList.push(floorData);
+        }
     });
 
     return floorList;