Merge branch 'feature/cart' into 'release/5.4.1'

全场赠品和加价购顺序和促销品商品标题样式



See merge request !231

@@ -58,28 +58,28 @@
 </div>
 {{#if freebieOrAdvanceBuy}}
 <div class="all-gift-box box">
-    {{#if advanceBuyCount}}
-    <div class="gift-item advanceBuy">
+    {{#if giftCount}}
+    <div class="gift-item freebie">
         <div class="flag">
-            <i class="iconfont price-gift"></i>
+            <i class="iconfont gift"></i>
         </div>
         <div class="content">
-            <div class="info">加价购</div>
-            <div class="opt to-gift {{#ifnot advanceHasStorage}}no-storage{{/ifnot}}">
-                <a href="javascript:;">{{#if advanceHasStorage}}去换购{{^}}已抢光{{/if}}</a><i class="iconfont to-arrow"></i>
+            <div class="info">赠品</div>
+            <div class="opt to-gift {{#ifnot giftHasStorage}}no-storage{{/ifnot}}">
+                <a href="javascript:;">{{#if giftHasStorage}}领赠品{{^}}已抢光{{/if}}</a><i class="iconfont to-arrow"></i>
             </div>
         </div>
     </div>
     {{/if}}
-    {{#if giftCount}}
-    <div class="gift-item freebie">
+    {{#if advanceBuyCount}}
+    <div class="gift-item advanceBuy">
         <div class="flag">
-            <i class="iconfont gift"></i>
+            <i class="iconfont price-gift"></i>
         </div>
         <div class="content">
-            <div class="info">赠品</div>
-            <div class="opt to-gift {{#ifnot giftHasStorage}}no-storage{{/ifnot}}">
-                <a href="javascript:;">{{#if giftHasStorage}}领赠品{{^}}已抢光{{/if}}</a><i class="iconfont to-arrow"></i>
+            <div class="info">加价购</div>
+            <div class="opt to-gift {{#ifnot advanceHasStorage}}no-storage{{/ifnot}}">
+                <a href="javascript:;">{{#if advanceHasStorage}}去换购{{^}}已抢光{{/if}}</a><i class="iconfont to-arrow"></i>
             </div>
         </div>
     </div>

@@ -66,7 +66,7 @@ let cartObj = {
         let self = this;
         let promotionId = $(e.currentTarget).data('id');
         let promotionType = $(e.currentTarget).data('type');
-        let promotionTitle = encodeURIComponent($(e.currentTarget).data('title'));
+        let promotionTitle = encodeURIComponent(`以下商品参加【${$(e.currentTarget).data('title')}】促销活动`);
 
         self.toPromotionPage({
             promotionType,

 .good-list-page {
     .intro-text {
         width: 100%;
-        height: 1.5rem;
-        line-height: 1.5rem;
-        padding: 0 0.5rem;
-        font-size: 0.6rem;
+        line-height: 24px;
+        padding: 22px 24px;
+        font-size: 24px;
         background: #f8f8f8;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        overflow: hidden;
         text-align: center;
     }
+
     .search-input {
         position: relative;
         padding: 14px 30px;