Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0

@@ -158,9 +158,9 @@ const _getEditorial = d => {
 const floorMap = {
     slider: _getSliderData,
     标题: _getBrandAdFloor,
-    新品抢先看: _getNewArrivals,
+    NEW: _getNewArrivals,
     CLASSIC: _getClassicBrands,
-    潮流标识: _getStyleIcon,
+    STYLE: _getStyleIcon,
     EDITORIAL: _getEditorial
 };
 
@@ -205,17 +205,25 @@ const _processFloorData = d => {
         let floorTitle;
         let floorData;
 
+        console.log(data);
+
         // 处理banner
         if (_isBannerFloor(data)) {
             floorData = floorMap.slider(data.data);
 
         // 判断标题类型
-        } else if (_isObjectTitle(data.data.title) && floorMap[floorTitle]) {
+        } else if (_isObjectTitle(data.data.title)) {
             floorTitle = _getKey(data.data.title.title);
-            floorData = floorMap[floorTitle](data.data.list);
-        } else if (floorMap[floorTitle]) {
+
+            if (floorMap[floorTitle]) {
+                floorData = floorMap[floorTitle](data.data.list);
+            }
+        } else if (data.data.title) {
             floorTitle = _getKey(data.data.title);
-            floorData = floorMap[floorTitle](data.data.list);
+
+            if (floorMap[floorTitle]) {
+                floorData = floorMap[floorTitle](data.data.list);
+            }
         }
 
         floorList.push(floorData);
@@ -226,12 +234,14 @@ const _processFloorData = d => {
 
 const getContent = type => {
     return channelApi.getChannelDataAsync(type).then(result => {
-        const l = camelCase(result.data.list);
-        const floor = {
-            content: _processFloorData(l)
-        };
+        if (result.data && result.data.list) {
+            const l = camelCase(result.data.list);
+            const floor = {
+                content: _processFloorData(l)
+            };
 
-        return floor;
+            return floor;
+        }
     });
 
     /* eslint-disable */

@@ -28,7 +28,7 @@
     <div class="goods-wrapper">
         <div class="goods">
         </div>
-        <div class="goods-img-list">
+        <div class="goods-img-list clearfix">
         </div>
     </div>
 </div>

@@ -94,8 +94,8 @@ if (isProduction) {
     Object.assign(module.exports, {
         appName: 'www.yohoblk.com for test',
         domains: {
-            api: 'http://api-test1.yohops.com:9999/',
-            service: 'http://service-test1.yohops.com:9999/',
+            api: 'http://testapi.yoho.cn:28078/',
+            service: 'http://testservice.yoho.cn:28077/',
             search: 'http://192.168.102.216:8080/yohosearch/'
         },
         useOneapm: true,

@@ -342,12 +342,13 @@
             }
 
             .goods-img-list {
-                float: right;
-                margin: 2px 10px;
+                margin: 2px 13px;
+                float: left;
 
                 .goods-img-col {
                     display: inline-block;
                     vertical-align: top;
+                    width: 60px;
                 }
 
                 img {