Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

@@ -20,7 +20,7 @@ if (homePage === 'brands') {
     require('./brands');
 }
 
-if (['boys','girls','kids','lifestyle'].indexOf(homePage) > -1) {
+if ($.inArray(homePage, ['boys','girls','kids','lifestyle']) > -1) {
     require('../common/new-arrivls')({
         type: homePage,
         url: '/common/getNewArrival',

@@ -183,11 +183,13 @@
         margin-right:-10px; 
         .good-info{
             width: 240px;
+            height: 400px;
+            margin-bottom:0px; 
             .good-detail-img{
                 height: 320px;
             }
         }
-        .price{
+        .good-detail-text{
             text-align: center;
         }
     }
@@ -257,7 +259,7 @@
             position: relative;
             width: 100%;
             text-align: center;
-            top: -20px;
+            padding-top: 40px;
             a{
                 display: block;
                 height: 35px;
@@ -349,6 +351,7 @@
     .goods-container{
         .good-info{
             width: 188px;
+            height: 360px;
             .good-detail-img{
                 height: 255px;
             }
@@ -434,6 +437,7 @@
         .goods-container{
             .good-info{
                 width: 280px;
+                height: 465px;
                 .good-detail-img{
                     height: 374px;
                 }
@@ -485,6 +489,7 @@
         .goods-container{
             .good-info{
                 width: 222px!important;
+                height: 408px!important;
                 .good-detail-img{
                     height: 298px!important;
                 }