Merge branch 'master' of git.yoho.cn:fe/yohobuywap-node into feature/couponcenter

@@ -25,6 +25,15 @@ function setDetailText() {
     });
     });
 }
 }
 
 
+function setDefaultHeight() {
+    var $detailImg = $('.good-detail-img');
+
+    $detailImg.css({
+        height: $detailImg.find('img').height() - 1,
+        background: '#c3c3c3'
+    });
+}
+
 setDetailText();
 setDetailText();
 
 
 $('.detail-tab span').on('click', function() {
 $('.detail-tab span').on('click', function() {
@@ -33,9 +42,19 @@ $('.detail-tab span').on('click', function() {
 
 
     if ($(this).index() === 1) {
     if ($(this).index() === 1) {
         setDetailText();
         setDetailText();
+        lazyLoad($('img.lazy'));
+
+        setTimeout(function() {
+            setDefaultHeight();
+        }, 2000);
     }
     }
 });
 });
 
 
+setTimeout(function() {
+    setDefaultHeight();
+}, 2500);
+
+
 window.setCookie('installmentUid', window.queryString.uid);
 window.setCookie('installmentUid', window.queryString.uid);
 window.setCookie('udid', window.queryString.udid);
 window.setCookie('udid', window.queryString.udid);
 window.setCookie('clientType', window.queryString.client_type);
 window.setCookie('clientType', window.queryString.client_type);

@@ -4,7 +4,7 @@
     }
     }
 
 
     li {
     li {
-        width: 580px;
+        width: 100%;
         height: 200px;
         height: 200px;
         margin-bottom: 30px;
         margin-bottom: 30px;
         position: relative;
         position: relative;

@@ -88,7 +88,32 @@
         }
         }
 
 
         #goods-list {
         #goods-list {
-            margin: 15px 0 0 15px;
+            padding: 0 15px;
+            margin: 15px 0 0;
+            width: 100%;
+            box-sizing: border-box;
+        }
+
+        .good-info {
+            float: left;
+            padding: 0 15px;
+            margin: 10px 0 40px;
+            box-sizing: border-box;
+            width: 50%;
+            height: auto;
+        }
+
+        .good-thumb {
+            width: 100%;
+            height: 100%;
+        }
+
+        .good-detail-img {
+            height: auto;
+
+            img {
+                height: 100%;
+            }
         }
         }
     }
     }
 
 

@@ -126,7 +126,7 @@
         .info-box {
         .info-box {
             margin-left: 22px;
             margin-left: 22px;
             float: left;
             float: left;
-            width: 452px;
+            width: 402px;
         }
         }
 
 
         h3 {
         h3 {
@@ -154,7 +154,7 @@
     .installment-box {
     .installment-box {
         text-align: center;
         text-align: center;
         float: left;
         float: left;
-        width: 213.333px;
+        width: 33%;
         font-size: 22px;
         font-size: 22px;
     }
     }
 
 

@@ -294,7 +294,7 @@
     border-top: 1px solid #e0e0e0;
     border-top: 1px solid #e0e0e0;
 
 
     label {
     label {
-        margin-left: 75px;
+        margin-left: 60px;
         width: 320px;
         width: 320px;
         height: 120px;
         height: 120px;
         float: left;
         float: left;