Merge remote-tracking branch 'origin/5.5.0' into 5.5.0

@@ -36,7 +36,6 @@ export default class Detail extends Component {
         if (!data) {
             return null;
         }
-        console.log(data.toJS());
         return (
             <View style={[styles.container, {height: this.state.totalHeight}]}>
                 <Text style={styles.title}>{data.get('product_name')} </Text>

@@ -1099,9 +1099,39 @@ function homeFloorAutoReportData(list,channel) {
                 let titleParam = autoReportData(channlStr,floorName,floorID,floorIndex,"0",moreUrl);
                 title.yh_exposureData = titleParam ? titleParam : "";
 
-                
+                //list添加曝光数据
+                let inFloorIndex = 0;
+                let itemList = floorData.list ? floorData.list : [];
+                for (let j = 0; j < itemList.length; j++) {
+                	inFloorIndex = inFloorIndex + 1;
+                    let imageItem = itemList[j];
+                    let actionUrl = imageItem.url;
+                    let param = autoReportData(channlStr,floorName,floorID,floorIndex,inFloorIndex,actionUrl);
+                    imageItem.yh_exposureData = param;
 
-    			break;
+                    //添加商品1曝光数据
+                    if(imageItem.goods0){
+                        inFloorIndex = inFloorIndex + 1;
+                        let url = imageItem.goods0.url;
+                        let goodsParam = autoReportData(channlStr,floorName,floorID,floorIndex,inFloorIndex,url);
+                        imageItem.goods0.yh_exposureData = goodsParam;
+                    }
+                    //添加商品2曝光数据
+                    if(imageItem.goods1){
+                        inFloorIndex = inFloorIndex + 1;
+                        let url = imageItem.goods1.url;
+                        let goodsParam = autoReportData(channlStr,floorName,floorID,floorIndex,inFloorIndex,url);
+                        imageItem.goods1.yh_exposureData = goodsParam;
+                    }
+                    //添加商品3曝光数据
+                    if(imageItem.goods2){
+                        inFloorIndex = inFloorIndex + 1;
+                        let url = imageItem.goods2.url;
+                        let goodsParam = autoReportData(channlStr,floorName,floorID,floorIndex,inFloorIndex,url);
+                        imageItem.goods2.yh_exposureData = goodsParam;
+                    }
+                }
+                break;
             }
             case 'sixLinesFloor': {
                 //more添加曝光数据