Merge branch 'feature/new-sale' into 'web'

Feature/new sale

See merge request !84

@@ -5,6 +5,7 @@
  */
  */
 
 
 var $ = require('yoho.jquery'),
 var $ = require('yoho.jquery'),
+    lazyLoad = require('yoho.lazyload'),
     productEvent = require('../common/product-event');
     productEvent = require('../common/product-event');
 
 
 var $goodsContainer = $('.goods-container'),
 var $goodsContainer = $('.goods-container'),
@@ -15,6 +16,8 @@ var $goodsContainer = $('.goods-container'),
     $productListNav = $('.product-list-nav'),
     $productListNav = $('.product-list-nav'),
     productList;
     productList;
 
 
+lazyLoad($('img.lazy'));
+
 /**
 /**
  * @description 初始化鼠标移入商品列表弹层效果
  * @description 初始化鼠标移入商品列表弹层效果
  * @num 每列存放商品的个数
  * @num 每列存放商品的个数

+/**
+ *@description: 商品列表1180px下搜索页的样式
+ *列表页、new-sale页在此基础上覆盖（index.scss）
+ */
+
 .good-info {
 .good-info {
-    height: 400px; //todo
     margin-bottom: 35px;
     margin-bottom: 35px;
     width: 222px;
     width: 222px;
     margin-right: 10px;
     margin-right: 10px;
@@ -8,7 +12,7 @@
     //图片
     //图片
     .good-detail-img {
     .good-detail-img {
         width: 100%;
         width: 100%;
-        /*height: 300px;*/
+        height: 300px;
         position: relative;
         position: relative;
 
 
         .good-thumb, img.lazy {
         .good-thumb, img.lazy {
@@ -166,4 +170,6 @@
             overflow: hidden;
             overflow: hidden;
         }
         }
     }
     }
+
+
 }
 }

@@ -33,15 +33,20 @@
 
 
         .good-info {
         .good-info {
             width: 235px;
             width: 235px;
+
+            .good-detail-img {
+                height: 315px;
+            }
         }
         }
 
 
         .block-next-page {
         .block-next-page {
             width: 235px;
             width: 235px;
-            height: 314px;
+            height: 315px;
         }
         }
     }
     }
 }
 }
 
 
+/*990px*/
 @media (max-width: 1180px) {
 @media (max-width: 1180px) {
 
 
     .product-list-page, .new-sale-page {
     .product-list-page, .new-sale-page {
@@ -58,7 +63,10 @@
 
 
             .good-info {
             .good-info {
                 width: 195px;
                 width: 195px;
-                height: 350px;
+
+                .good-detail-img {
+                    height: 261px;
+                }
             }
             }
 
 
             .block-next-page {
             .block-next-page {