Authored by 郝肖肖

'判断分摊价是否存在'

... ... @@ -88,8 +88,8 @@ const handlePaymentInfo = (d, address) => {
d.shopping_cart_data.hasCoin = _.round(d.yoho_coin * 100); // 有货币稀释
_.forEach(d.goods_list, g => {
g.last_vip_price = Number(g.last_vip_price).toFixed(2);
g.sales_price = Number(g.sales_price).toFixed(2);
g.last_vip_price = g.last_vip_price && Number(g.last_vip_price).toFixed(2) || '';
g.sales_price = g.sales_price && Number(g.sales_price).toFixed(2) || '';
// link to goods
g.linkToGoods = helper.urlFormat(`/product/pro_${g.product_id}_${g.goods_id}/${g.cn_alphabet}.html`,
... ...
... ... @@ -365,9 +365,8 @@ const getOrders = (uid, page, limit, type, isPage)=> {
newOrder.goods = _.get(order, 'order_goods', []).map((good) => {
let newGood = {};
good.real_pay_price = Number(good.real_pay_price).toFixed(2);
good.sales_price = Number(good.sales_price).toFixed(2);
good.real_pay_price = good.real_pay_price && Number(good.real_pay_price).toFixed(2) || '';
good.sales_price = good.sales_price && Number(good.sales_price).toFixed(2) || '';
newGood.href = helpers.getUrlBySkc(good.product_id, good.goods_id, good.cn_alphabet);
newGood.thumb = helpers.image(good.goods_image, 100, 100);
newGood.name = good.product_name;
... ... @@ -777,8 +776,8 @@ const _getOrderDetail = co(function * (uid, orderId) {
// 商品信息
if (orderDetail.order_goods) {
detail.goods = _.get(orderDetail, 'order_goods', []).map((good) => {
good.real_pay_price = Number(good.real_pay_price).toFixed(2);
good.sales_price = Number(good.sales_price).toFixed(2);
good.real_pay_price = good.real_pay_price && Number(good.real_pay_price).toFixed(2) || '';
good.sales_price = good.sales_price && Number(good.sales_price).toFixed(2) || '';
let newGood = {
url: helpers.getUrlBySkc(good.product_id, good.goods_id, good.cn_alphabet),
... ...
... ... @@ -66,7 +66,7 @@
{{/eq}}
</p>
</div>
<div class="product-price td" style="width:148px;">¥{{productPrice}}
<div class="product-price td {{#if linePrice}}line-margin-top{{/if}}" style="width:148px;">¥{{productPrice}}
{{#if linePrice}}
<p class="line-through">¥{{linePrice}}</p>
{{/if}}
... ...
... ... @@ -1213,7 +1213,6 @@
.product-price {
margin-top: 33px;
position: relative;
padding-top: 15px !important;
.sale-info {
position: absolute;
... ... @@ -1233,6 +1232,10 @@
}
}
.line-margin-top {
padding-top: 15px !important;
}
.sale-info {
&.active {
.sale-info-title {
... ...