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

@@ -364,7 +364,7 @@ class UserData
     public static function suggestData($udid, $page = 1, $limit = 30)
     public static function suggestData($udid, $page = 1, $limit = 30)
     {
     {
         $param = Yohobuy::param();
         $param = Yohobuy::param();
-        $param['udid'] = $udid;
+        $param['udid'] = $udid . '13686403'; // 为了兼容udid长度
         $param['page'] = $page;
         $param['page'] = $page;
         $param['limit'] = $limit;
         $param['limit'] = $limit;
         $param['client_secret'] = Sign::getSign($param);
         $param['client_secret'] = Sign::getSign($param);
@@ -385,7 +385,7 @@ class UserData
     {
     {
         $param = Yohobuy::param();
         $param = Yohobuy::param();
         $param['uid'] = $uid;
         $param['uid'] = $uid;
-        $param['udid'] = $udid;
+        $param['udid'] = $udid . '13686403';// 为了兼容udid长度
         $param['is_reliable'] = $reliable;
         $param['is_reliable'] = $reliable;
         $param['suggest_id'] = $suggest_id;
         $param['suggest_id'] = $suggest_id;
         $param['client_secret'] = Sign::getSign($param);
         $param['client_secret'] = Sign::getSign($param);

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

@@ -359,11 +359,15 @@ $basicBtnC:#eb0313;
             position: relative;
             position: relative;
             padding: pxToRem(30px) pxToRem(60px) pxToRem(30px) pxToRem(28px);
             padding: pxToRem(30px) pxToRem(60px) pxToRem(30px) pxToRem(28px);
             line-height: pxToRem(36px);
             line-height: pxToRem(36px);
+            // line-height: pxToRem(88px);
+        }
+
+        .short-text {
             white-space: nowrap;
             white-space: nowrap;
             overflow: hidden;
             overflow: hidden;
             text-overflow: ellipsis;
             text-overflow: ellipsis;
-            // line-height: pxToRem(88px);
         }
         }
+
         .iconfont {
         .iconfont {
             position: absolute;
             position: absolute;
             top: pxToRem(30px);
             top: pxToRem(30px);

@@ -68,7 +68,7 @@
         {{# list}}
         {{# list}}
         {{#if @first}}
         {{#if @first}}
         {{#if text}}
         {{#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}}
         {{/if}}
         {{/if}}
         {{/ list}}
         {{/ list}}