Authored by 杨延青

Merge branch 'feature/tagPrice' into 'release/6.9.22'

fix saleprice cover



See merge request !24
... ... @@ -90,6 +90,15 @@ class featureModel extends global.yoho.BaseModel {
obj.brandurl = `//m.yohobuy.com/product/index/brand?domain=${val.brand_domain}&openby:yohobuy={"action":"go.brand","params":{"brand_id":${val.brand_id}}}`; // eslint-disable-line
}
if (!_.isEmpty(val.cover_info)) {
let { share_content } = val.cover_info;
Object.assign(obj, {
saleprice: share_content,
salesPriceClass: 'share-price'
});
}
resList[val.product_skn] = obj;
});
});
... ...
... ... @@ -27,6 +27,15 @@ let _getProduct = function(o, type) {
type: type || 'yoho'
};
if (!_.isEmpty(o.cover_info)) {
let { share_content } = o.cover_info;
Object.assign(res, {
sales_price: share_content,
salesPriceClass: 'share-price'
});
}
plan = _.sortBy(plan, item => {
return +item.show_begin_time;
});
... ...
... ... @@ -48,7 +48,7 @@
<div class="new-price"
style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if
conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}; text-align: left;">
<span class="sale-price"{{#if conf.priceFontColor}}
<span class="sale-price {{salesPriceClass}}"{{#if conf.priceFontColor}}
style="color:{{conf.priceFontColor}};" {{/if}}>¥{{saleprice}}</span>
{{#if marketprice}}
<span class="market-price"{{#if conf.priceFontColor}}
... ...
... ... @@ -27,7 +27,7 @@
<div class="new-price"
style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if
conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}; text-align: left;">
<span class="sale-price"{{#if conf.priceFontColor}}
<span class="sale-price {{salesPriceClass}}"{{#if conf.priceFontColor}}
style="color:{{conf.priceFontColor}};" {{/if}}>¥{{saleprice}}</span>
{{#if marketprice}}
<span class="market-price"{{#if conf.priceFontColor}}
... ...
... ... @@ -239,6 +239,10 @@
color: #fff;
}
> .share-price {
margin-left: 25%;
}
> .market-price {
margin-left: 6px;
font-size: 18px;
... ...