Authored by 李靖

提示样式修改

@@ -27,9 +27,12 @@ @@ -27,9 +27,12 @@
27 <div class="cart-content normal-good active"> 27 <div class="cart-content normal-good active">
28 {{#commonCart}} 28 {{#commonCart}}
29 {{#if shipCost.shippingTip}} 29 {{#if shipCost.shippingTip}}
30 - <div class="tips">  
31 - {{shipCost.shippingTip}}  
32 - </div> 30 + <a class="tips" href="/product/boys-new/">
  31 + <div>
  32 + {{shipCost.shippingTip}}
  33 + </div>
  34 + <span class="iconfont free-shipping">{{#if shipCost.freeShipping}}去凑单{{/if}}&nbsp;&#xe604;</span>
  35 + </a>
33 {{/if}} 36 {{/if}}
34 {{> cart-content}} 37 {{> cart-content}}
35 {{/commonCart}} 38 {{/commonCart}}
@@ -12,13 +12,30 @@ @@ -12,13 +12,30 @@
12 12
13 .tips { 13 .tips {
14 margin-top: -20px; 14 margin-top: -20px;
15 - height: 54px;  
16 - line-height: 54px; 15 + height: 70px;
  16 + line-height: 70px;
17 font-size: 25px; 17 font-size: 25px;
18 - background: #f0f0f0;  
19 - color: #b7b7b7; 18 + background: #ff7f81;
  19 + color: #fff;
20 padding-left: 30px; 20 padding-left: 30px;
21 padding-right: 30px; 21 padding-right: 30px;
  22 + display: block;
  23 +
  24 + div {
  25 + width: 570px;
  26 + float: left;
  27 + overflow: hidden;
  28 + text-overflow: ellipsis;
  29 + white-space: nowrap;
  30 + }
  31 +
  32 + .free-shipping {
  33 + font-size: 25px;
  34 + width: 120px;
  35 + float: left;
  36 + text-align: right;
  37 + color: #fff;
  38 + }
22 } 39 }
23 40
24 .presell-info { 41 .presell-info {
@@ -356,7 +356,8 @@ const procCartData = (data, isAdvanceCart) => { @@ -356,7 +356,8 @@ const procCartData = (data, isAdvanceCart) => {
356 } 356 }
357 result.shipCost = { 357 result.shipCost = {
358 isFree: _.get(data, 'shipping_cost_prompt.is_shipping_cost_free', 'N'), 358 isFree: _.get(data, 'shipping_cost_prompt.is_shipping_cost_free', 'N'),
359 - shippingTip: _.get(data, 'shipping_cost_prompt.shipping_cost_tips', '').replace(/¥/g, '¥') 359 + shippingTip: _.get(data, 'shipping_cost_prompt.shipping_cost_tips', '').replace(/¥/g, '¥'),
  360 + freeShipping: _.get(data, 'shipping_cost_prompt.is_shipping_cost_free', 'N') === 'Y'
360 }; 361 };
361 362
362 // 计算正常商品且有库存的总数 363 // 计算正常商品且有库存的总数