fe / yohobuywap-node · Commits

Go to a project

Authored by zhangxiaoru
Commit 4115aeae290812b375f4ffcca4eec02bb2eed967 1 parent db38e736

购物车页 加价购 赠品

Inline Side-by-side
Showing 4 changed files with 13 additions and 5 deletions
@@ -6,9 +6,9 @@ @@ -6,9 +6,9 @@
6 <div class="deps"> 6 <div class="deps">
7 <p class="name row">{{name}}</p> 7 <p class="name row">{{name}}</p>
8 <p class="row"> 8 <p class="row">
9 - <span class="price">&yen;{{#if price}}{{price}}{{else}}{{marketPrice}}{{/if}}</span>  
10 - {{#if price}}  
11 - <span class="price market-price">&yen;{{marketPrice}}</span> 9 + <span class="price">&yen;{{#if price}}{{price}}{{else}}{{salesPrice}}{{/if}}</span>
  10 + {{#if salesPrice}}
  11 + <span class="price market-price">&yen;{{salesPrice}}</span>
12 {{/if}} 12 {{/if}}
13 </p> 13 </p>
14 <span class="chose">选择</span> 14 <span class="chose">选择</span>
@@ -61,6 +61,7 @@ @@ -61,6 +61,7 @@
61 <div class="bottom"> 61 <div class="bottom">
62 <div class="price{{#if reAddToCart}} pull-left{{/if}}"> 62 <div class="price{{#if reAddToCart}} pull-left{{/if}}">
63 <span class="market-price">¥{{price}}</span> 63 <span class="market-price">¥{{price}}</span>
  64 + {{#if salesPrice}}<span class="sales-price">¥{{salesPrice}}</span>{{/if}}
64 {{#if isStudents}}<span class="vip fill-text">学</span>{{/if}} 65 {{#if isStudents}}<span class="vip fill-text">学</span>{{/if}}
65 {{#if isVipPrice}}<span class="vip fill-text">VIP</span>{{/if}} 66 {{#if isVipPrice}}<span class="vip fill-text">VIP</span>{{/if}}
66 </div> 67 </div>
@@ -228,6 +228,12 @@ @@ -228,6 +228,12 @@
228 font-size: 28px; 228 font-size: 28px;
229 color: #d0253b; 229 color: #d0253b;
230 230
  231 + .sales-price {
  232 + color: #b6b6b6;
  233 + margin-left: 5px;
  234 + text-decoration: line-through;
  235 + }
  236 +
231 .vip { 237 .vip {
232 margin-left: 11px; 238 margin-left: 11px;
233 background-color: #d0021b; 239 background-color: #d0021b;
@@ -71,8 +71,8 @@ const formatAdvanceGoods = (gifts, isGift) => { @@ -71,8 +71,8 @@ const formatAdvanceGoods = (gifts, isGift) => {
71 id: good.product_skn, 71 id: good.product_skn,
72 name: good.product_name, 72 name: good.product_name,
73 thumb: good.goods_images ? helpers.image(good.goods_images, 120, 160) : '', 73 thumb: good.goods_images ? helpers.image(good.goods_images, 120, 160) : '',
74 - price: transPrice(good.last_price),  
75 - marketPrice: isGift ? '0.00' : transPrice(good.market_price), 74 + price: isGift ? '0.00' : transPrice(good.last_price),
  75 + salesPrice: good.last_price !== good.sales_price ? transPrice(good.sales_price) : false,
76 count: good.storage_number 76 count: good.storage_number
77 }; 77 };
78 }) 78 })
@@ -105,6 +105,7 @@ const formatCartGoods = (goodData, isAdvanceCart, isValid, inValidLow) => { @@ -105,6 +105,7 @@ const formatCartGoods = (goodData, isAdvanceCart, isValid, inValidLow) => {
105 size: goodData.size_name, 105 size: goodData.size_name,
106 checked: goodData.selected === 'Y', 106 checked: goodData.selected === 'Y',
107 price: transPrice(goodData.last_vip_price), 107 price: transPrice(goodData.last_vip_price),
  108 + salesPrice: goodData.sales_price !== goodData.last_vip_price ? transPrice(goodData.sales_price) : false,
108 isVipPrice: goodData.sales_price !== goodData.last_vip_price && goodData.discount_tag === 'V', 109 isVipPrice: goodData.sales_price !== goodData.last_vip_price && goodData.discount_tag === 'V',
109 isStudents: goodData.sales_price !== goodData.last_vip_price && goodData.discount_tag === 'S', 110 isStudents: goodData.sales_price !== goodData.last_vip_price && goodData.discount_tag === 'S',
110 count: goodData.buy_number, 111 count: goodData.buy_number,