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

@@ -282,12 +282,12 @@ const helpData = () => {
         helpApi.getSelfService()
     ]).then(result => {
         return _.assign({
-            hotSearch: _.slice(result[0].data, 0, 5),
+            hotSearch: _.slice(_.get(result, '[0].data', {}), 0, 5),
             selfService: {
                 categoryName: '自助服务',
-                list: result[2].data
+                list: _.get(result, '[2].data', {})
             }
-        }, _processHomeCategoryFaq(result[1].data));
+        }, _processHomeCategoryFaq(_.get(result, '[1].data', {})));
     });
 };
 

@@ -22,20 +22,20 @@ module.exports = {
     },
     cookieDomain: 'yohoblk.com',
     domains: {
-        //favApi: 'http://192.168.102.31:8092/brower',
-        //api: 'http://192.168.102.205:8080/gateway/',
-        //service: 'http://192.168.102.205:8080/gateway/',
-        //search: 'http://192.168.102.216:8080/yohosearch/'
+        // favApi: 'http://192.168.102.31:8092/brower',
+        // api: 'http://192.168.102.205:8080/gateway/',
+        // service: 'http://192.168.102.205:8080/gateway/',
+        // search: 'http://192.168.102.216:8080/yohosearch/'
 
         // singleApi: 'http://single.yoho.cn/',
         // api: 'http://api.yoho.yohoops.org/',
         // service: 'http://service.yoho.yohoops.org/',
         // search: 'http://search.yohoops.org/yohosearch/'
 
-         singleApi: 'http://single.yoho.cn/',
-         api: 'http://api-test3.yohops.com:9999/',
-         service: 'http://service-test3.yohops.com:9999/',
-         search: 'http://search.yohoops.org/yohosearch/'
+        singleApi: 'http://single.yoho.cn/',
+        api: 'http://api-test3.yohops.com:9999/',
+        service: 'http://service-test3.yohops.com:9999/',
+        search: 'http://search.yohoops.org/yohosearch/'
     },
     useOneapm: false,
     useCache: false,

@@ -106,7 +106,7 @@ var recommmendProduct = {
 
                 _this.$dom.find('.tab-cont-' + obj.index).html(recProduct({result: result}));
                 _this.lazyImage();
-                _this.isShowChangeBtn.bind(result.length);
+                recommmendProduct.isShowChangeBtn(result.length);
 
                 if (obj.index === 1 && $headTab.eq(0).hasClass('hide')) {
                     curTab.click();

@@ -18,6 +18,7 @@
             height: calc($smallImgHeight*2+$space+10px);
             display: inline-block;
             position: relative;
+            width: $bigImgWidth;
 
             &.bottom-space {
                 margin-bottom: 20px;
@@ -33,7 +34,7 @@
             height: 70px;
             position: absolute;
             bottom: 0;
-            background: url("/channel/jb-bg.png") repeat-x;
+            background: resolve("channel/jb-bg.png") repeat-x;
             color: #fff;
             font-size: 14px;
             line-height: 70px;

@@ -307,6 +307,7 @@
     .goods-area {
         margin: 0;
         position: relative;
+        width: 880px;
 
         .goods {
             margin: 30px 30px 16px 0;
@@ -316,9 +317,11 @@
             cursor: pointer;
             width: 263px;
 
+            /*
             &:nth-child(3n+0) {
                 margin-right: 0;
             }
+            */
 
             .goods-brand {
                 padding: 10px 10px 4px;
@@ -409,10 +412,10 @@
                 img {
                     margin-bottom: 10px;
                     cursor: pointer;
+                }
 
-                    &:nth-child(4n) {
-                        margin-top: 11px;
-                    }
+                img:nth-child(4n) {
+                    margin-top: 11px;
                 }
             }
         }