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

@@ -8,7 +8,7 @@
     lazyLoad = require('yoho.lazyload');
 
 var goodsSwiper,
-    $discountFolder = $('.goods-discount .discount-folder'),
+    $discountFolder = $('.goodsDiscount .discount-folder'),
     $discountArrow = $('.goodsDiscount .first-item span');
 
 
@@ -31,7 +31,7 @@ goodsSwiper = new Swiper('.banner-swiper', {
 
 
 //初始化goods-discount
-if (0 === $('.goods-discount .discount-folder').children().length) {
+if (0 === $('.goodsDiscount .discount-folder').children().length) {
     $discountFolder.css('display', 'none');
     $discountArrow.html('');
 }

@@ -30,8 +30,13 @@
         margin-top: pxToRem(20px);
     }
     .materials {
+        overflow: hidden;
         &.page-block{
             margin-bottom: 0;
+            border-bottom: none;
+            .detail{
+                margin-bottom: 0;
+            }
         }
         .detail {
             .material-item{

@@ -113,8 +113,8 @@
     </div> 
     {{/ enterStore}}
 
-    <div id="productDesc"></div>
-    <!-- {{> product/product-description}} -->
+    <!-- <div id="productDesc"></div> -->
+    {{> product/product-description}}
     {{> product/recommend-for-you}}
 
     {{#cartInfo}}