Merge branch 'release/5.4.1' into gray

@@ -54,7 +54,7 @@
                     <label class="check-btn{{#isY default}} checked{{/isY}}" data-id="{{delivery_way_id}}"
                     title="{{delivery_way_name}}：运费 ¥ {{delivery_way_cost}}">{{delivery_way_name}}：运费 ¥ {{delivery_way_cost}}</label>
                     {{#isEqual delivery_way_id 2}}
-                        <span>您所选择的区域暂不在支持顺丰派送范围内，点击<a href="＃" class="more-info">查看详情</a> </span>
+                        <span>您所选择的区域暂不在支持顺丰派送范围内</span>
                     {{/isEqual}}
                 </p>
             {{/ deliveryWay}}

@@ -358,9 +358,16 @@ Cart = {
         if ($('[data-role="gift-sel-btn"]').length) {
 
             new RConfirm(content, function() {
-                var firstGift = $('[data-role="gift-sel-btn"]')[0];
+                var $firstGift = $('[data-role="gift-sel-btn"]').eq(0);
+                var $sitem = $firstGift;
 
-                $('html,body').animate({scrollTop: $(firstGift).offset().top - 50 + 'px'}, 500);
+                if (!$sitem.is(':visible')) {
+                    $sitem = $sitem.closest('.sale-info');
+                }
+
+                $('html,body').animate({scrollTop: $sitem.offset().top - 50 + 'px'}, 500, 'swing', function() {
+                    $firstGift.click();
+                });
             }, function() {
                 Cart._submit($this);
 

@@ -598,6 +598,11 @@
                     &+p {
                         margin-bottom: 0;
                         color: #b0b0b0;
+                        position: absolute;
+                        max-width: 190px;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
                     }
                 }