Authored by 陈峰

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

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



See merge request !231
@@ -58,28 +58,28 @@ @@ -58,28 +58,28 @@
58 </div> 58 </div>
59 {{#if freebieOrAdvanceBuy}} 59 {{#if freebieOrAdvanceBuy}}
60 <div class="all-gift-box box"> 60 <div class="all-gift-box box">
61 - {{#if advanceBuyCount}}  
62 - <div class="gift-item advanceBuy"> 61 + {{#if giftCount}}
  62 + <div class="gift-item freebie">
63 <div class="flag"> 63 <div class="flag">
64 - <i class="iconfont price-gift"></i> 64 + <i class="iconfont gift"></i>
65 </div> 65 </div>
66 <div class="content"> 66 <div class="content">
67 - <div class="info">加价购</div>  
68 - <div class="opt to-gift {{#ifnot advanceHasStorage}}no-storage{{/ifnot}}">  
69 - <a href="javascript:;">{{#if advanceHasStorage}}去换购{{^}}已抢光{{/if}}</a><i class="iconfont to-arrow"></i> 67 + <div class="info">赠品</div>
  68 + <div class="opt to-gift {{#ifnot giftHasStorage}}no-storage{{/ifnot}}">
  69 + <a href="javascript:;">{{#if giftHasStorage}}领赠品{{^}}已抢光{{/if}}</a><i class="iconfont to-arrow"></i>
70 </div> 70 </div>
71 </div> 71 </div>
72 </div> 72 </div>
73 {{/if}} 73 {{/if}}
74 - {{#if giftCount}}  
75 - <div class="gift-item freebie"> 74 + {{#if advanceBuyCount}}
  75 + <div class="gift-item advanceBuy">
76 <div class="flag"> 76 <div class="flag">
77 - <i class="iconfont gift"></i> 77 + <i class="iconfont price-gift"></i>
78 </div> 78 </div>
79 <div class="content"> 79 <div class="content">
80 - <div class="info">赠品</div>  
81 - <div class="opt to-gift {{#ifnot giftHasStorage}}no-storage{{/ifnot}}">  
82 - <a href="javascript:;">{{#if giftHasStorage}}领赠品{{^}}已抢光{{/if}}</a><i class="iconfont to-arrow"></i> 80 + <div class="info">加价购</div>
  81 + <div class="opt to-gift {{#ifnot advanceHasStorage}}no-storage{{/ifnot}}">
  82 + <a href="javascript:;">{{#if advanceHasStorage}}去换购{{^}}已抢光{{/if}}</a><i class="iconfont to-arrow"></i>
83 </div> 83 </div>
84 </div> 84 </div>
85 </div> 85 </div>
@@ -66,7 +66,7 @@ let cartObj = { @@ -66,7 +66,7 @@ let cartObj = {
66 let self = this; 66 let self = this;
67 let promotionId = $(e.currentTarget).data('id'); 67 let promotionId = $(e.currentTarget).data('id');
68 let promotionType = $(e.currentTarget).data('type'); 68 let promotionType = $(e.currentTarget).data('type');
69 - let promotionTitle = encodeURIComponent($(e.currentTarget).data('title')); 69 + let promotionTitle = encodeURIComponent(`以下商品参加【${$(e.currentTarget).data('title')}】促销活动`);
70 70
71 self.toPromotionPage({ 71 self.toPromotionPage({
72 promotionType, 72 promotionType,
1 .good-list-page { 1 .good-list-page {
2 .intro-text { 2 .intro-text {
3 width: 100%; 3 width: 100%;
4 - height: 1.5rem;  
5 - line-height: 1.5rem;  
6 - padding: 0 0.5rem;  
7 - font-size: 0.6rem; 4 + line-height: 24px;
  5 + padding: 22px 24px;
  6 + font-size: 24px;
8 background: #f8f8f8; 7 background: #f8f8f8;
9 - white-space: nowrap;  
10 - text-overflow: ellipsis;  
11 - overflow: hidden;  
12 text-align: center; 8 text-align: center;
13 } 9 }
  10 +
14 .search-input { 11 .search-input {
15 position: relative; 12 position: relative;
16 padding: 14px 30px; 13 padding: 14px 30px;