Merge branch 'release/5.5' of git.yoho.cn:fe/yohobuy-node into release/5.5

@@ -65,7 +65,6 @@ const getCouponsList = (uid, type, page, limit)=>{
                 if (limits.indexOf('2') >= 0) {
                 if (limits.indexOf('2') >= 0) {
                     extra.push('限量');
                     extra.push('限量');
                 }
                 }
-                delete item.isNoLimit;
 
 
                 result[i].extraPro = extra.join('、');
                 result[i].extraPro = extra.join('、');
                 result[i].isNoLimit = item.isNoLimit === 'true' ? true : false;
                 result[i].isNoLimit = item.isNoLimit === 'true' ? true : false;

@@ -928,7 +928,7 @@ function actionAddKeyWords() {
 function searchSuggestHistory() {
 function searchSuggestHistory() {
     var param = {
     var param = {
         return_type: 'jsonp',
         return_type: 'jsonp',
-        query: encodeURIComponent(window.queryString().query.replace(/\+/ig, ' '))
+        query: encodeURIComponent((window.queryString().query || '').replace(/\+/ig, ' '))
     };
     };
 
 
     if ($searchKey.attr('alt')) {
     if ($searchKey.attr('alt')) {
@@ -1014,9 +1014,6 @@ function searchSuggestRecommend(channel, key) {
  */
  */
 $(function() {
 $(function() {
     searchSuggestRecommend();
     searchSuggestRecommend();
-    if (location.href.indexOf('www.yohobuy.com') < 0) {
-        searchSuggestHistory();
-    }
 });
 });
 
 
 actionCover();
 actionCover();

@@ -14,7 +14,7 @@
         .coupons-name {
         .coupons-name {
             width: 240px;
             width: 240px;
         }
         }
-    
+
         .coupons-info {
         .coupons-info {
             width: 388px;
             width: 388px;
 
 
@@ -72,7 +72,7 @@
             width: 240px;
             width: 240px;
             height: 80px;
             height: 80px;
             color: #fff;
             color: #fff;
-            
+
             &.coupons-notuse {
             &.coupons-notuse {
                 background-image: resolve(home/notuse.png);
                 background-image: resolve(home/notuse.png);
 
 
@@ -95,7 +95,7 @@
 
 
             .coupons-num {
             .coupons-num {
                 margin-top: 10px;
                 margin-top: 10px;
-                
+
                 .coupons-sht {
                 .coupons-sht {
                     width: 70px;
                     width: 70px;
 
 
@@ -111,6 +111,7 @@
                     margin-left: 5px;
                     margin-left: 5px;
                     line-height: 23px;
                     line-height: 23px;
                     text-align: left;
                     text-align: left;
+                    overflow: hidden;
                 }
                 }
             }
             }
         }
         }
@@ -172,4 +173,4 @@
             background: #e8044f;
             background: #e8044f;
         }
         }
     }
     }
-}
+}