fe / yohobuywap-node-activity · Commits

Go to a project

Authored by shuaiguo
Commit 96ca1b95bd264a108e1db29906b7352a2159febf 2 parents f21317a6 f320ff31

Merge branch 'refs/heads/develop'

Inline Side-by-side
Showing 9 changed files with 61 additions and 11 deletions
... ... @@ -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;
});
});
... ... @@ -120,7 +129,8 @@ class featureModel extends global.yoho.BaseModel {
enterShopBgImage: value.enterShopBgImage,
brandColor: value.brandColor,
buyBtnImg: value.buyBtnImg,
showLastSoldTpl: value.showLastSoldTpl
showLastSoldTpl: value.showLastSoldTpl,
arrivalPriceStyle: value.arrivalPriceStyle
};
value._defaultSkns && value._defaultSkns.forEach(val => {
... ...
... ... @@ -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;
});
... ...
... ... @@ -33,7 +33,7 @@
<a class="second-part">
<div class="new-brand-div" style="top: 0;">
{{#if collageprice}}
<div class="new-price collage-price"
<div class="new-price collage-price{{#isEqualOr conf.arrivalPriceStyle '1'}} arrival-price-style{{/isEqualOr}}"
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}}
... ... @@ -45,9 +45,9 @@
</div>
{{else}}
{{#isEqualOr conf.showSalePrice '1'}}
<div class="new-price"
<div class="new-price{{#isEqualOr conf.arrivalPriceStyle '1'}} arrival-price-style{{/isEqualOr}}"
style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if
conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}; text-align: left;">
conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}; text-align: left;">
<span class="sale-price"{{#if conf.priceFontColor}}
style="color:{{conf.priceFontColor}};" {{/if}}>¥{{saleprice}}</span>
{{#if marketprice}}
... ...
... ... @@ -12,7 +12,7 @@
<a class="second-part" style="position: absolute; bottom: 0; left: 0; right: 0;">
<div class="new-brand-div" style="top: 0;">
{{#if collageprice}}
<div class="new-price collage-price"
<div class="new-price collage-price{{#isEqualOr conf.arrivalPriceStyle '1'}} arrival-price-style{{/isEqualOr}}"
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}}
... ... @@ -24,7 +24,7 @@
</div>
{{else}}
{{#isEqualOr conf.showSalePrice '1'}}
<div class="new-price"
<div class="new-price{{#isEqualOr conf.arrivalPriceStyle '1'}} arrival-price-style{{/isEqualOr}}"
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}}
... ...
... ... @@ -39,7 +39,7 @@
<a class="second-part">
<div class="new-brand-div" style="top: 0;">
{{#isEqualOr showSalePrice '1'}}
<div class="new-price" style="text-align: left;">
<div class="new-price{{#isEqualOr arrivalPriceStyle '1'}} arrival-price-style{{/isEqualOr}}" style="text-align: left;">
<span class="sale-price"{{#if priceFontColor}} style="color:{{priceFontColor}};" {{/if}}></span>
<span class="market-price"{{#if priceFontColor}} style="color:{{priceFontColor}};" {{/if}}></span>
</div>
... ...
... ... @@ -27,7 +27,7 @@
<a class="second-part" style="position: absolute; bottom: 0; left: 0; right: 0;">
<div class="new-brand-div" style="top: 0;">
{{#isEqualOr showSalePrice '1'}}
<div class="new-price"
<div class="new-price{{#isEqualOr arrivalPriceStyle '1'}} arrival-price-style{{/isEqualOr}}"
style="{{#if salePriceBgColor}}background:{{salePriceBgColor}};{{/if}}
{{#if
priceFontColor}}color:{{priceFontColor}};{{/if}};text-align: left;">
... ... @@ -61,7 +61,7 @@
'1'}}product-brand{{else}}product-detail{{/isEqualOr}}"
style="position: relative; background-color: unset;padding-bottom: 0;padding-top:0;display: flex;align-items: center;"
href="{{brandurl}}">
<div class="brand-name add-padding5"
<div class="brand-name add-padding5"
style="position: absolute;{{#if fontColor}}color:{{fontColor}};{{/if}}padding-left: 0.3rem;" >{{brandname}}</div>
... ...
... ... @@ -133,7 +133,7 @@ module.exports = {
notifyUrl: domains.service + 'payment/weixin_notify',
},
geetestJs: '//static.geetest.com/static/tools/gt.js',
jsSdk: 'https://cdn.yoho.cn/js-sdk/1.3.32/jssdk.js',
jsSdk: 'https://cdn.yoho.cn/js-sdk/1.3.34/jssdk.js',
redis: {
connect: {
host: '192.168.102.49',
... ...
{
"name": "yohobuywap-node-activity",
"version": "6.11.3",
"version": "6.12.0",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...
... ... @@ -247,6 +247,23 @@
}
}
.new-price.arrival-price-style {
height: 40px;
line-height: 40px;
> .sale-price {
margin-left: 21%;
font-size: 24px;
margin-right: -4px;
}
> .market-price {
transform: scale(0.8, 0.8);
transform-origin: left;
display: inline-block !important;
}
}
.second-part > .new-brand-div {
position: absolute;
top: -4px;
... ... @@ -610,6 +627,20 @@
font-weight: 400;
color: #fff;
}
&.arrival-price-style {
height: 52px;
line-height: 68px;
> .sale-price {
font-size: 34px;
margin-left: 22%;
}
> .market-price {
margin-left: 0;
}
}
}
}
... ...