fe / yohobuy-node · Commits

Go to a project

Authored by 郝肖肖
Commit 367b0040ce43b08947ca0b52f739ca599d25dce1 1 parent d4fc225c

'cart-or-orderList-salesPrice'

Inline Side-by-side
Showing 11 changed files with 110 additions and 10 deletions
... ... @@ -132,6 +132,7 @@ const formatCartGoods = (cartGoods, isAdvanceCart, inValid, isOffShelves, analys
productColor: it.factory_goods_name,
productSize: it.size_name,
productPrice: transPrice(it.last_vip_price), // self::transPrice($value['real_price']);
salesPrice: transPrice(it.sales_price),
productNum: Number(it.buy_number),
storageNum: Number(it.storage_number),
isSoldOut: parseInt(it.storage_number, 10) === 0 || parseInt(it.off_shelves, 10) === 1, // 已售罄
... ...
... ... @@ -91,6 +91,9 @@ const handlePaymentInfo = (d, address) => {
// link to goods
g.linkToGoods = helper.urlFormat(`/product/pro_${g.product_id}_${g.goods_id}/${g.cn_alphabet}.html`,
'', 'item');
g.isVipPrice = g.sales_price !== g.last_vip_price && g.discount_tag === 'V';
g.isStuPrice = g.sales_price !== g.last_vip_price && g.discount_tag === 'S';
});
resData.goodsList = d.goods_list;
... ...
... ... @@ -142,7 +142,16 @@
尺码：<span class="size">{{size_name}}</span>
</td>
<td class="border-top price">
<span class="red">¥ {{round last_price 2}}</span>
<p class="red">¥ {{round last_price 2}}</p>
{{#if sales_price}}
<p class="line-through">¥ {{round sales_price 2}}</p>
{{/if}}
{{#isVipPrice}}
<p class="tip-message">(VIP)</p>
{{/isVipPrice}}
{{#isStuPrice}}
<p class="tip-message">(学生价)</p>
{{/isStuPrice}}
</td>
<td class="border-top">× {{buy_number}}</td>
<td{{#if @first}} class="border-top"{{/if}}></td>
... ...
... ... @@ -371,6 +371,8 @@ const getOrders = (uid, page, limit, type, isPage)=> {
newGood.color = good.factory_color_name;
newGood.size = good.size_name;
newGood.price = good.goods_price;
newGood.realPayPrice = good.real_pay_price;
newGood.salesPrice = good.sales_price;
let buyNum = _.parseInt(good.buy_number);
let refundNum = _.parseInt(good.refund_num);
... ... @@ -766,6 +768,8 @@ const _getOrderDetail = co(function * (uid, orderId) {
color: good.factory_color_name,
size: good.size_name,
price: good.goods_price,
realPayPrice: good.real_pay_price,
salesPrice: good.sales_price,
coin: good.yoho_give_coin,
num: good.buy_number,
sum: good.goods_amount,
... ...
... ... @@ -260,7 +260,21 @@
{{/if}}
</p>
</td>
<td>{{price}}</td>
<td>
<p>{{realPayPrice}}</p>
{{#if salesPrice}}
<p class="line-through">{{salesPrice}}</p>
{{/if}}
{{#isVipPrice}}
<p class="tip-message">(VIP)</p>
{{/isVipPrice}}
{{#isStuPrice}}
<p class="tip-message">(学生价)</p>
{{/isStuPrice}}
{{#if free}}
<span class="free-icon">免单</span>
{{/if}}
</td>
<td>{{coin}}个</td>
<td>{{num}}</td>
<td>{{sum}}</td>
... ...
... ... @@ -60,9 +60,17 @@
</span>
</div>
</div>
<div class="price{{#if free}} free-price{{/if}}">
<em>{{price}}</em>
<div class="price">
<p>{{realPayPrice}}</p>
{{#if salesPrice}}
<p class="line-through">{{salesPrice}}</p>
{{/if}}
{{#isVipPrice}}
<p class="tip-message">(VIP)</p>
{{/isVipPrice}}
{{#isStuPrice}}
<p class="tip-message">(学生价)</p>
{{/isStuPrice}}
{{#if free}}
<span class="free-icon">免单</span>
{{/if}}
... ...
... ... @@ -67,6 +67,9 @@
</p>
</div>
<div class="product-price td" style="width:148px;">¥{{productPrice}}
{{#if salesPrice}}
<p class="line-through">¥{{salesPrice}}</p>
{{/if}}
{{#isVipPrice}}
<p class="tip-message">(VIP)</p>
{{/isVipPrice}}
... ...
... ... @@ -1213,6 +1213,7 @@
.product-price {
margin-top: 33px;
position: relative;
padding-top: 15px !important;
.sale-info {
position: absolute;
... ... @@ -1224,6 +1225,12 @@
.tip-message {
margin-top: -2px;
}
.line-through {
font-weight: normal;
text-decoration: line-through;
color: #9a9a9a;
}
}
.sale-info {
... ...
... ... @@ -729,6 +729,21 @@
.price {
font-size: 14px;
p {
line-height: 18px;
}
}
p.line-through {
font-weight: normal;
text-decoration: line-through;
color: #9a9a9a;
}
p.tip-message {
font-weight: normal;
color: #ff575c;
}
.border-top {
... ...
... ... @@ -148,10 +148,6 @@
padding: 5px;
font-weight: bold;
&.free-price em {
text-decoration: line-through;
}
.free-icon {
display: block;
width: 37px;
... ... @@ -165,6 +161,21 @@
border: 1px solid #80bb45;
border-radius: 3px;
}
p {
line-height: 18px;
}
p.line-through {
font-weight: normal;
text-decoration: line-through;
color: #9a9a9a;
}
p.tip-message {
font-weight: normal;
color: #ff575c;
}
}
.count {
... ...
... ... @@ -73,9 +73,34 @@
.content {
padding: 10px 20px 20px;
.free-icon {
display: block;
width: 37px;
height: 18px;
line-height: 18px;
font-size: 12px;
text-align: center;
color: #80bb45;
background: #e7fbc0;
margin: 5px auto;
border: 1px solid #80bb45;
border-radius: 3px;
}
p {
line-height: 18px;
}
p.line-through {
font-weight: normal;
text-decoration: line-through;
color: #9a9a9a;
}
p.tip-message {
font-weight: normal;
color: #ff575c;
}
}
.order-progress {
... ... @@ -565,7 +590,7 @@
display: inline-block;
height: 22px;
width: 22px;
vertical-align: text-bottom;
vertical-align: middle;
}
.success-icon {
... ...