Merge remote-tracking branch 'origin/develop'

@@ -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();
         }

@@ -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>

@@ -30,7 +30,7 @@
     {{# goodsName}}
     <h2 class="goodsName"><span>{{.}}</span></h2>
     {{/ goodsName}}
-    
+
     {{# goodsSubtitle}}
     <h1 class="goodsSubtitle"><span>{{.}}</span></h1>
     {{/ goodsSubtitle}}
@@ -59,7 +59,7 @@
             </span>
             <span class="vip-price ">{{text}}</span>
         </li>
-        {{/ list}} 
+        {{/ list}}
     </ul>
     {{/vipLevel}}
 
@@ -68,10 +68,10 @@
         {{# list}}
         {{#if @first}}
         {{#if text}}
-        <h1 class="first-item">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1>     
-        {{/if}}  
+        <h1 class="first-item short-text">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1>     
+        {{/if}}
         {{/if}}
-        {{/ list}}        
+        {{/ list}}
         <div class="discount-folder">
         {{# list}}
         {{#if @first}}
@@ -81,12 +81,12 @@
         {{/if}}
         {{/if}}
         {{/list}}
-        </div>   
+        </div>
     </div>
     {{/ goodsDiscount}}
 
     {{# feedbacks}}
-    <div class="feedback-list ">    
+    <div class="feedback-list ">
       {{#if commentsNum}}
         {{> product/feedback-tab}}
       {{else}}
@@ -101,15 +101,15 @@
       {{/if}}
     </div>
     {{/ feedbacks}}
-    
-    {{# enterStore}}       
+
+    {{# enterStore}}
     <div id="enter-store" class="enter-store page-block">
         <a class="store-logo" href="{{url}}" style="">
             <img class="lazy" data-original="{{img}}" alt="{{storeName}}">
         </a>
         <a class="store-name" href="{{url}}">{{storeName}}</a>
         <a class="store-link" href="{{url}}">进入店铺<span class="iconfont">&#xe604;</span></a>
-    </div> 
+    </div>
     {{/ enterStore}}
 
     <div id="productDesc"> </div>
@@ -117,10 +117,10 @@
     {{> product/recommend-for-you}}
 
     {{#cartInfo}}
-    <div class="cart-bar">       
+    <div class="cart-bar">
         <span class="num-tag hide"></span>
         <a href="{{cartUrl}}" class="num-incart iconfont">&#xe62c;</a>
-        
+
         {{#if addToCartUrl}}
             <a  id="addtoCart" href="{{addToCartUrl}}"  class="addto-cart">加入购物车</a>
         {{/if}}
@@ -133,7 +133,7 @@
             <a href="javascript:;"   class="sold-out">非卖品</a>
         {{/if}}
 
-        <a href="javascript:;" id="likeBtn" class="favorite iconfont {{#isCollect}}liked{{/isCollect}}">&#xe605;</a>  
+        <a href="javascript:;" id="likeBtn" class="favorite iconfont {{#isCollect}}liked{{/isCollect}}">&#xe605;</a>
     </div>
     {{/cartInfo}}
     {{#if introUrl}}
@@ -147,4 +147,4 @@
     {{/if}}
 
 </div>
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer}}

@@ -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="">