fe / yoho-blk · Commits

Go to a project

Authored by 王水玲
Commit af18dcd65ecf1c5f074f2548bdbfcbdd9bd44035 1 parent 6f435b96

vip 修改

Inline Side-by-side
Showing 6 changed files with 33 additions and 20 deletions
... ... @@ -561,9 +561,7 @@ const getOrderDetail = (uid, code) => {
detail.allAddress = detail.area + detail.address;
if (detail.promotion_formulas[1]) {
detail.promotion_formulas[1].promotion = 'VIP优惠';
}
_.set(_.find(detail.promotion_formulas, {promotion: '活动金额'}), 'promotion', 'VIP优惠');
return {
orderDetail: Object.assign(basicData, detail)
... ...
... ... @@ -42,8 +42,8 @@
{{#if marketPrice}}
<p class="market-price">¥{{round marketPrice 2}}</p>
{{/if}}
<p class="desc">
{{# vipPrice}}
{{# vipPrice}}
<p class="desc">
<span class="vip-price">
{{#if unLogin}}
<span class="unlogin">
... ... @@ -59,8 +59,8 @@
<em class="cur"> {{price}} </em>
{{/ prices}}
</span>
{{/ vipPrice}}
</p>
</p>
{{/ vipPrice}}
<div class="trade-wrapper">
<div class="option-content">
... ...
... ... @@ -178,7 +178,7 @@
{{#each promotion_formula_list}}
<li>
<span class="balance-title">
{{promotion}}
{{promotion}}：
{{#if shippingCut}}
<em>(原价：{{shippingOrigin}}元，优惠：{{shippingCut}}元)</em>
{{/if}}
... ...
... ... @@ -38,13 +38,13 @@
</li>
<li class="price-num">
<span class="price sale-price">
¥ {{round sales_price 2}}
¥ {{round last_vip_price 2}}
{{#isVipPrice}}<br><i class="vip-tag">（VIP）</i>{{/isVipPrice}}
</span>
{{> cart/stepper }}
</li>
<li class="total-price-action">
<span class="price item-total-price">¥ {{round (multiple sales_price buy_number) 2}}</span>
<span class="price item-total-price">¥ {{round (multiple last_vip_price buy_number) 2}}</span>
<div class="actions">
<div class="remove-item action" data-product_extra_info='{"goodsId": "{{goods_id}}", "cnAlphabet": "{{cn_alphabet}}", "productId": "{{product_id}}", "salesPrice": "{{round sales_price 2}}", "productName": "{{product_name}}", "goodType":"advance", "selected": "{{selected}}"}'><span class="iconfont">&#xe614;</span> &nbsp;删&nbsp;&nbsp;&nbsp;&nbsp;除</div>
<div class="send-to-favorite action" data-product_id={{product_id}}>移入收藏夹</div>
... ... @@ -93,13 +93,13 @@
</li>
<li class="price-num">
<span class="price sale-price">
¥ {{round sales_price 2}}
¥ {{round last_vip_price 2}}
{{#isVipPrice}}<br><i class="vip-tag">（VIP）</i>{{/isVipPrice}}
</span>
{{> cart/stepper }}
</li>
<li class="total-price-action">
<span class="price item-total-price">¥ {{round (multiple sales_price buy_number) 2}}</span>
<span class="price item-total-price">¥ {{round (multiple last_vip_price buy_number) 2}}</span>
<div class="actions">
<div class="remove-item action" data-product_extra_info='{"goodsId": "{{goods_id}}", "cnAlphabet": "{{cn_alphabet}}", "productId": "{{product_id}}", "salesPrice": "{{round sales_price 2}}", "productName": "{{product_name}}", "goodType":"ordinary", "selected": "{{selected}}"}'><span class="iconfont">&#xe614;</span> &nbsp;删&nbsp;&nbsp;&nbsp;&nbsp;除</div>
<div class="send-to-favorite action" data-product_id={{product_id}}>移入收藏夹</div>
... ... @@ -142,14 +142,14 @@
</li>
<li class="price-num">
<span class="price sale-price">
¥ {{round sales_price 2}}
¥ {{round last_vip_price 2}}
{{#isVipPrice}}<br><i class="vip-tag">（VIP）</i>{{/isVipPrice}}
</span>
</span>
{{> cart/stepper }}
</li>
<li class="total-price-action">
<span class="price item-total-price">¥ {{round (multiple sales_price buy_number) 2}}</span>
<span class="price item-total-price">¥ {{round (multiple last_vip_price buy_number) 2}}</span>
<div class="actions">
<div class="remove-item action" data-product_id={{product_id}}><span class="iconfont">&#xe614;</span> &nbsp;删&nbsp;&nbsp;&nbsp;&nbsp;除</div>
<div class="send-to-favorite action" data-product_id={{product_id}}>移入收藏夹</div>
... ...
... ... @@ -578,6 +578,12 @@
li {
line-height: 30px;
}
.balance-title {
text-align: right;
min-width: 65px;
display: inline-block;
}
}
.balance-cost {
... ...
... ... @@ -53,7 +53,10 @@
{{/expect_arrival_time}}
</li>
<li class="price-num">
<span class="price sale-price">¥ {{round sales_price 2}}</span>
<span class="price sale-price">
¥ {{round last_vip_price 2}}
{{#isVipPrice}}<br><i class="vip-tag">（VIP）</i>{{/isVipPrice}}
</span>
<div class="stepper" data-productType={{goods_type}}>
<div class="minus action {{#isEqual buy_number 1}}disable{{/isEqual}}">
<span class="iconfont">&#xe621;</span>
... ... @@ -70,7 +73,7 @@
</div>
</li>
<li class="total-price-action">
<span class="price item-total-price">¥ {{round (multiple sales_price buy_number) 2}}</span>
<span class="price item-total-price">¥ {{round (multiple last_vip_price buy_number) 2}}</span>
<div class="actions">
<div class="remove-item action" data-product_extra_info='{"goodsId": "{{goods_id}}", "cnAlphabet": "{{cn_alphabet}}", "productId": "{{product_id}}", "salesPrice": "{{round sales_price 2}}", "productName": "{{product_name}}", "goodType":"ordinary", "selected": "{{selected}}"}'><span class="iconfont">&#xe614;</span> &nbsp;删&nbsp;&nbsp;&nbsp;&nbsp;除</div>
<div class="send-to-favorite action" data-product_id={{product_id}}>移入收藏夹</div>
... ... @@ -118,7 +121,10 @@
</div>
</li>
<li class="price-num">
<span class="price sale-price">¥ {{round sales_price 2}}</span>
<span class="price sale-price">
¥ {{round last_vip_price 2}}
{{#isVipPrice}}<br><i class="vip-tag">（VIP）</i>{{/isVipPrice}}
</span>
<div class="stepper" data-productType={{goods_type}}>
<div class="minus action {{#isEqual buy_number 1}}disable{{/isEqual}}">
<span class="iconfont">&#xe621;</span>
... ... @@ -135,7 +141,7 @@
</div>
</li>
<li class="total-price-action">
<span class="price item-total-price">¥ {{round (multiple sales_price buy_number) 2}}</span>
<span class="price item-total-price">¥ {{round (multiple last_vip_price buy_number) 2}}</span>
<div class="actions">
<div class="remove-item action" data-product_extra_info='{"goodsId": "{{goods_id}}", "cnAlphabet": "{{cn_alphabet}}", "productId": "{{product_id}}", "salesPrice": "{{round sales_price 2}}", "productName": "{{product_name}}", "goodType":"ordinary", "selected": "{{selected}}"}'><span class="iconfont">&#xe614;</span> &nbsp;删&nbsp;&nbsp;&nbsp;&nbsp;除</div>
<div class="send-to-favorite action" data-product_id={{product_id}}>移入收藏夹</div>
... ... @@ -177,7 +183,10 @@
</div>
</li>
<li class="price-num">
<span class="price sale-price">¥ {{round sales_price 2}}</span>
<span class="price sale-price">
¥ {{round last_vip_price 2}}
{{#isVipPrice}}<br><i class="vip-tag">（VIP）</i>{{/isVipPrice}}
</span>
<div class="stepper" data-productType={{goods_type}}>
<div class="minus action {{#isEqual buy_number 1}}disable{{/isEqual}}">
<span class="iconfont">&#xe621;</span>
... ... @@ -194,7 +203,7 @@
</div>
</li>
<li class="total-price-action">
<span class="price item-total-price">¥ {{round (multiple sales_price buy_number) 2}}</span>
<span class="price item-total-price">¥ {{round (multiple last_vip_price buy_number) 2}}</span>
<div class="actions">
<div class="remove-item action" data-product_id={{product_id}}><span class="iconfont">&#xe614;</span> &nbsp;删&nbsp;&nbsp;&nbsp;&nbsp;除</div>
<div class="send-to-favorite action" data-product_id={{product_id}}>移入收藏夹</div>
... ...