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

@@ -243,6 +243,4 @@ function scrollHandler() {
 }
 
 //srcoll to load more
-$(window).scroll(function() {
-    window.requestAnimationFrame(scrollHandler);
-});
\ No newline at end of file
+$(window).scroll(scrollHandler);
\ No newline at end of file

@@ -13,7 +13,8 @@ var goodsSwiper,
     $discountArrow = $('.goodsDiscount .first-item span');
 
 var goodsDiscountEl = document.getElementById('goodsDiscount'),
-    goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl);
+    goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl),
+    $discountFirstItem = $(goodsDiscountEl).find('.first-item');
 
 var $cart = $('.cart-bar');
 
@@ -62,9 +63,11 @@ if (0 === $discountFolder.children().length) {
 if (goodsDiscountHammer && $discountFolder.children().length > 0) {
     goodsDiscountHammer.on('tap', function(e) {
         if ($discountFolder.is(':hidden')) {
+            $discountFirstItem.removeClass('short-text');
             $discountArrow.removeClass('icon-down').addClass('icon-up').html('');
             $discountFolder.slideDown();
         } else {
+            $discountFirstItem.addClass('short-text');
             $discountArrow.removeClass('icon-up').addClass('icon-down').html('');
             $discountFolder.slideUp();
         }

@@ -72,7 +72,7 @@
             width: pxToRem(472px);
             height: pxToRem(88px);
             line-height: pxToRem(88px);
-            margin: pxToRem(125px) auto 0 auto;
+            margin: pxToRem(80px) auto 0 auto;
             background: #444;
             text-align: center;
             color: #fff;

@@ -114,7 +114,7 @@
         &.no-login {
             padding: 0;
             height: pxToRem(88px);
-            .link-item {
+            .link-item p {
                 font-size: pxToRem(32px);
                 line-height: pxToRem(88px);
             }

@@ -23,6 +23,7 @@
             overflow: hidden;
         }
         .user-name {
+            float: left;
             max-width: 240rem / $pxConvertRem;
             text-overflow:ellipsis; 
             white-space:nowrap; 

@@ -8,6 +8,7 @@ $basicBtnC:#eb0313;
 .good-detail-page {
     overflow: hidden;
     background-color: #f0f0f0;
+
     .page-block {
         background-color: #fff;
         box-sizing: border-box;
@@ -26,6 +27,11 @@ $basicBtnC:#eb0313;
                 font-size: pxToRem(18px);
             }
         }
+
+        .pro-detail {
+            margin-top: pxToRem(20px);
+            margin-bottom: pxToRem(20px);
+        }
         .detail {
             margin-top: pxToRem(20px);
             margin-bottom: pxToRem(20px);
@@ -353,11 +359,15 @@ $basicBtnC:#eb0313;
             position: relative;
             padding: pxToRem(30px) pxToRem(60px) pxToRem(30px) pxToRem(28px);
             line-height: pxToRem(36px);
+            // line-height: pxToRem(88px);
+        }
+
+        .short-text {
             white-space: nowrap;
             overflow: hidden;
             text-overflow: ellipsis;
-            // line-height: pxToRem(88px);
         }
+
         .iconfont {
             position: absolute;
             top: pxToRem(30px);

@@ -32,7 +32,7 @@
             </a>
         </div>
         <div class="connect-item connect-tel">
-            <a href="tel:400-889-9649" title="电话客服">
+            <a href="tel:400-889-9646" title="电话客服">
                 <span class="icon iconfont icon-tel">&#xe63e;</span>
                 电话客服
                 <p>

@@ -68,7 +68,7 @@
         {{# list}}
         {{#if @first}}
         {{#if text}}
-        <h1 class="first-item">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1>     
+        <h1 class="first-item short-text">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1>     
         {{/if}}
         {{/if}}
         {{/ list}}

@@ -138,7 +138,7 @@
         {{{title}}}
         <span class="en-title">{{{enTitle}}}</span>
     </h1>
-    <div class="detail">
+    <div class="pro-detail">
         <p>{{{desc}}}</p>
         {{#list}}
         <img class="lazy" data-original="{{img}}" alt="">