fe / yohobuywap-node-activity · Commits

Go to a project

Authored by 邱骏
Commit 70deaafd233d8800888a8e2f540ec9f05133b914 1 parent c92ee29c

修改因定时模板导致的分享错误

Inline Side-by-side
Showing 8 changed files with 29 additions and 80 deletions
... ... @@ -57,7 +57,6 @@ class featureModel extends global.yoho.BaseModel {
saleprice: val.sales_price,
marketprice: val.sales_price === val.market_price ? '' : val.market_price,
brandname: val.brand_name,
collageprice: val.collage_price,
product_skn: val.product_skn,
product_price_plan_list: _.sortBy(val.product_price_plan_list, o => {
return +o.show_begin_time;
... ...
... ... @@ -170,7 +170,6 @@
{{#isEqualOr type 'productGroup'}}
{{! 商品池}}
{{#isEqualOr newStyle '0'}}
{{> feature/product-old-style}}
{{/isEqualOr}}
... ...
... ... @@ -32,32 +32,18 @@
{{#if conf.priceBgImage}}
<a class="second-part">
<div class="new-brand-div" style="top: 0;">
{{#if collageprice}}
<div class="new-price collage-price"
{{#isEqualOr conf.showSalePrice '1'}}
<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}}
style="color:{{conf.priceFontColor}};" {{/if}}>¥{{collageprice}}</span>
style="color:{{conf.priceFontColor}};" {{/if}}>¥{{saleprice}}</span>
{{#if marketprice}}
<span class="market-price"{{#if conf.priceFontColor}}
style="color:{{conf.priceFontColor}};" {{/if}}>¥{{marketprice}}</span>
{{/if}}
</div>
{{else}}
{{#isEqualOr conf.showSalePrice '1'}}
<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}}
style="color:{{conf.priceFontColor}};" {{/if}}>¥{{saleprice}}</span>
{{#if marketprice}}
<span class="market-price"{{#if conf.priceFontColor}}
style="color:{{conf.priceFontColor}};" {{/if}}>¥{{marketprice}}</span>
{{/if}}
</div>
{{/isEqualOr}}
{{/if}}
{{/isEqualOr}}
</div>
<img class="price-img" src="{{image2 conf.priceBgImage q=85}}">
</a>
... ...
... ... @@ -11,32 +11,18 @@
{{#if conf.priceBgImage}}
<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"
{{#isEqualOr conf.showSalePrice '1'}}
<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}}
style="color:{{conf.priceFontColor}};" {{/if}}>¥{{collageprice}}</span>
style="color:{{conf.priceFontColor}};" {{/if}}>¥{{saleprice}}</span>
{{#if marketprice}}
<span class="market-price"{{#if conf.priceFontColor}}
style="color:{{conf.priceFontColor}};" {{/if}}>¥{{marketprice}}</span>
{{/if}}
</div>
{{else}}
{{#isEqualOr conf.showSalePrice '1'}}
<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}}
style="color:{{conf.priceFontColor}};" {{/if}}>¥{{saleprice}}</span>
{{#if marketprice}}
<span class="market-price"{{#if conf.priceFontColor}}
style="color:{{conf.priceFontColor}};" {{/if}}>¥{{marketprice}}</span>
{{/if}}
</div>
{{/isEqualOr}}
{{/if}}
{{/isEqualOr}}
</div>
<img class="price-img" src="{{image2 conf.priceBgImage q=85}}">
</a>
... ...
... ... @@ -28,30 +28,20 @@
{{#if conf.brandImg}}
<a class="second-part">
<div class="new-brand-div">
{{#if collageprice}}
<div class="new-price collage-price" style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}">
<span class="sale-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{collageprice}}</span>
{{#isEqualOr conf.showSalePrice '1'}}
<div class="new-price" style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}">
<span class="sale-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{saleprice}}</span>
{{#if marketprice}}
<span class="market-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{marketprice}}</span>
{{/if}}
</div>
{{else}}
{{#isEqualOr conf.showSalePrice '1'}}
<div class="new-price" style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}">
<span class="sale-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{saleprice}}</span>
{{#if marketprice}}
<span class="market-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{marketprice}}</span>
{{/if}}
</div>
{{/isEqualOr}}
{{#isEqualOr conf.showVipPrice '1'}}
<div class="vipprice" style="{{#if conf.vipFontColor}}color:{{conf.vipFontColor}};{{/if}}{{#if conf.vipBgColor}}background:{{conf.vipBgColor}};{{/if}}">
<span class="vip-price-text">VIP价</span>
<span class="vip-price-val">¥{{vipprice}}</span>
</div>
{{/isEqualOr}}
{{/if}}
{{/isEqualOr}}
{{#isEqualOr conf.showVipPrice '1'}}
<div class="vipprice" style="{{#if conf.vipFontColor}}color:{{conf.vipFontColor}};{{/if}}{{#if conf.vipBgColor}}background:{{conf.vipBgColor}};{{/if}}">
<span class="vip-price-text">VIP价</span>
<span class="vip-price-val">¥{{vipprice}}</span>
</div>
{{/isEqualOr}}
</div>
<img class="brand-img" src="{{image2 conf.brandImg q=85}}">
</a>
... ...
... ... @@ -26,29 +26,20 @@
<p class="product-name">{{productname}}</p>
{{/isEqualOr}}
<div class="product-detail-text">
{{#if collageprice}}
<div class="price collage-price" style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}">
<span class="sale-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{collageprice}}</span>
{{#isEqualOr conf.showSalePrice '1'}}
<div class="price" style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}">
<span class="sale-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{saleprice}}</span>
{{#if marketprice}}
<span class="market-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{marketprice}}</span>
{{/if}}
</div>
{{else}}
{{#isEqualOr conf.showSalePrice '1'}}
<div class="price" style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}">
<span class="sale-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{saleprice}}</span>
{{#if marketprice}}
<span class="market-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{marketprice}}</span>
{{/if}}
</div>
{{/isEqualOr}}
{{#isEqualOr conf.showVipPrice '1'}}
<div class="vipprice" style="{{#if conf.vipFontColor}}color:{{conf.vipFontColor}};{{/if}}{{#if conf.vipBgColor}}background:{{conf.vipBgColor}};{{/if}}">
<span class="vip-price-text">VIP价</span>
<span class="vip-price-val">¥{{vipprice}}</span>
</div>
{{/isEqualOr}}
{{/if}}
{{/isEqualOr}}
{{#isEqualOr conf.showVipPrice '1'}}
<div class="vipprice" style="{{#if conf.vipFontColor}}color:{{conf.vipFontColor}};{{/if}}{{#if conf.vipBgColor}}background:{{conf.vipBgColor}};{{/if}}">
<span class="vip-price-text">VIP价</span>
<span class="vip-price-val">¥{{vipprice}}</span>
</div>
{{/isEqualOr}}
</div>
</a>
{{#if conf.brandImg}}
... ...
<!--活动模板分享领券组件-->
<div class="web-share">
{{log .}}
{{#webShare}}
<a href="javascript:void(0)" class="web-share-button" data-stid="{{../share_template_id}}" data-scoupon="{{../share_condition}}"
data-spic="{{pic}}" data-sdesc="{{content}}" data-stitle="{{title}}" data-surl="{{url}}" data-slanding="{{../landing_attr}}"></a>
{{/webShare}}
... ...
{
"name": "yohobuywap-node-activity",
"version": "6.9.9-3",
"version": "6.9.9-4",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...