Fix conflict.

@@ -53,8 +53,9 @@ export default class ProductListCell extends Component {
     }
 
     _renderImages() {
-        let url = YH_Image.getSlicedUrl(data.get('default_images', ''), 290, 386, 2);   // 商品缩略图
         let {data, sourceType, similarIndex, rowID} = this.props;
+        let url = YH_Image.getSlicedUrl(data.get('default_images', ''), 290, 386, 2);   // 商品缩略图
+
 
         let isGlobalProduct = data.get('is_global') && data.get('is_global') == 'Y'; // 是否全球购商品
 

@@ -55,10 +55,10 @@ export default class NewUserFloor extends Component {
     }
 
     render() {
-      let data = this.props.data;
+      let data = this.props.data?this.props.data:{};
       let title = data.get('title').get('title');
       let moreUrl = data.get('title').get('more_url');
-      let bgUrl = data.get('background').get('src');
+      let bgUrl = '';
       let visible = bgUrl ? true : false;
       let bannerData = data.get('banner_image');
       let productData = data.get('list');