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 { @@ -57,7 +57,6 @@ class featureModel extends global.yoho.BaseModel {
57 saleprice: val.sales_price, 57 saleprice: val.sales_price,
58 marketprice: val.sales_price === val.market_price ? '' : val.market_price, 58 marketprice: val.sales_price === val.market_price ? '' : val.market_price,
59 brandname: val.brand_name, 59 brandname: val.brand_name,
60 - collageprice: val.collage_price,  
61 product_skn: val.product_skn, 60 product_skn: val.product_skn,
62 product_price_plan_list: _.sortBy(val.product_price_plan_list, o => { 61 product_price_plan_list: _.sortBy(val.product_price_plan_list, o => {
63 return +o.show_begin_time; 62 return +o.show_begin_time;
@@ -170,7 +170,6 @@ @@ -170,7 +170,6 @@
170 170
171 {{#isEqualOr type 'productGroup'}} 171 {{#isEqualOr type 'productGroup'}}
172 {{! 商品池}} 172 {{! 商品池}}
173 -  
174 {{#isEqualOr newStyle '0'}} 173 {{#isEqualOr newStyle '0'}}
175 {{> feature/product-old-style}} 174 {{> feature/product-old-style}}
176 {{/isEqualOr}} 175 {{/isEqualOr}}
@@ -32,32 +32,18 @@ @@ -32,32 +32,18 @@
32 {{#if conf.priceBgImage}} 32 {{#if conf.priceBgImage}}
33 <a class="second-part"> 33 <a class="second-part">
34 <div class="new-brand-div" style="top: 0;"> 34 <div class="new-brand-div" style="top: 0;">
35 - {{#if collageprice}}  
36 - <div class="new-price collage-price" 35 + {{#isEqualOr conf.showSalePrice '1'}}
  36 + <div class="new-price"
37 style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if 37 style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if
38 conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}; text-align: left;"> 38 conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}; text-align: left;">
39 <span class="sale-price"{{#if conf.priceFontColor}} 39 <span class="sale-price"{{#if conf.priceFontColor}}
40 - style="color:{{conf.priceFontColor}};" {{/if}}>¥{{collageprice}}</span> 40 + style="color:{{conf.priceFontColor}};" {{/if}}>¥{{saleprice}}</span>
41 {{#if marketprice}} 41 {{#if marketprice}}
42 <span class="market-price"{{#if conf.priceFontColor}} 42 <span class="market-price"{{#if conf.priceFontColor}}
43 style="color:{{conf.priceFontColor}};" {{/if}}>¥{{marketprice}}</span> 43 style="color:{{conf.priceFontColor}};" {{/if}}>¥{{marketprice}}</span>
44 {{/if}} 44 {{/if}}
45 </div> 45 </div>
46 - {{else}}  
47 - {{#isEqualOr conf.showSalePrice '1'}}  
48 - <div class="new-price"  
49 - style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if  
50 - conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}; text-align: left;">  
51 - <span class="sale-price"{{#if conf.priceFontColor}}  
52 - style="color:{{conf.priceFontColor}};" {{/if}}>¥{{saleprice}}</span>  
53 - {{#if marketprice}}  
54 - <span class="market-price"{{#if conf.priceFontColor}}  
55 - style="color:{{conf.priceFontColor}};" {{/if}}>¥{{marketprice}}</span>  
56 - {{/if}}  
57 - </div>  
58 - {{/isEqualOr}}  
59 - {{/if}}  
60 - 46 + {{/isEqualOr}}
61 </div> 47 </div>
62 <img class="price-img" src="{{image2 conf.priceBgImage q=85}}"> 48 <img class="price-img" src="{{image2 conf.priceBgImage q=85}}">
63 </a> 49 </a>
@@ -11,32 +11,18 @@ @@ -11,32 +11,18 @@
11 {{#if conf.priceBgImage}} 11 {{#if conf.priceBgImage}}
12 <a class="second-part" style="position: absolute; bottom: 0; left: 0; right: 0;"> 12 <a class="second-part" style="position: absolute; bottom: 0; left: 0; right: 0;">
13 <div class="new-brand-div" style="top: 0;"> 13 <div class="new-brand-div" style="top: 0;">
14 - {{#if collageprice}}  
15 - <div class="new-price collage-price" 14 + {{#isEqualOr conf.showSalePrice '1'}}
  15 + <div class="new-price"
16 style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if 16 style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if
17 conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}; text-align: left;"> 17 conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}; text-align: left;">
18 <span class="sale-price"{{#if conf.priceFontColor}} 18 <span class="sale-price"{{#if conf.priceFontColor}}
19 - style="color:{{conf.priceFontColor}};" {{/if}}>¥{{collageprice}}</span> 19 + style="color:{{conf.priceFontColor}};" {{/if}}>¥{{saleprice}}</span>
20 {{#if marketprice}} 20 {{#if marketprice}}
21 <span class="market-price"{{#if conf.priceFontColor}} 21 <span class="market-price"{{#if conf.priceFontColor}}
22 style="color:{{conf.priceFontColor}};" {{/if}}>¥{{marketprice}}</span> 22 style="color:{{conf.priceFontColor}};" {{/if}}>¥{{marketprice}}</span>
23 {{/if}} 23 {{/if}}
24 </div> 24 </div>
25 - {{else}}  
26 - {{#isEqualOr conf.showSalePrice '1'}}  
27 - <div class="new-price"  
28 - style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if  
29 - conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}; text-align: left;">  
30 - <span class="sale-price"{{#if conf.priceFontColor}}  
31 - style="color:{{conf.priceFontColor}};" {{/if}}>¥{{saleprice}}</span>  
32 - {{#if marketprice}}  
33 - <span class="market-price"{{#if conf.priceFontColor}}  
34 - style="color:{{conf.priceFontColor}};" {{/if}}>¥{{marketprice}}</span>  
35 - {{/if}}  
36 - </div>  
37 - {{/isEqualOr}}  
38 - {{/if}}  
39 - 25 + {{/isEqualOr}}
40 </div> 26 </div>
41 <img class="price-img" src="{{image2 conf.priceBgImage q=85}}"> 27 <img class="price-img" src="{{image2 conf.priceBgImage q=85}}">
42 </a> 28 </a>
@@ -28,30 +28,20 @@ @@ -28,30 +28,20 @@
28 {{#if conf.brandImg}} 28 {{#if conf.brandImg}}
29 <a class="second-part"> 29 <a class="second-part">
30 <div class="new-brand-div"> 30 <div class="new-brand-div">
31 - {{#if collageprice}}  
32 - <div class="new-price collage-price" style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}">  
33 - <span class="sale-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{collageprice}}</span> 31 + {{#isEqualOr conf.showSalePrice '1'}}
  32 + <div class="new-price" style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}">
  33 + <span class="sale-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{saleprice}}</span>
34 {{#if marketprice}} 34 {{#if marketprice}}
35 <span class="market-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{marketprice}}</span> 35 <span class="market-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{marketprice}}</span>
36 {{/if}} 36 {{/if}}
37 </div> 37 </div>
38 - {{else}}  
39 - {{#isEqualOr conf.showSalePrice '1'}}  
40 - <div class="new-price" style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}{{#if conf.priceFontColor}}color:{{conf.priceFontColor}};{{/if}}">  
41 - <span class="sale-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{saleprice}}</span>  
42 - {{#if marketprice}}  
43 - <span class="market-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{marketprice}}</span>  
44 - {{/if}}  
45 - </div>  
46 - {{/isEqualOr}}  
47 - {{#isEqualOr conf.showVipPrice '1'}}  
48 - <div class="vipprice" style="{{#if conf.vipFontColor}}color:{{conf.vipFontColor}};{{/if}}{{#if conf.vipBgColor}}background:{{conf.vipBgColor}};{{/if}}">  
49 - <span class="vip-price-text">VIP价</span>  
50 - <span class="vip-price-val">¥{{vipprice}}</span>  
51 - </div>  
52 - {{/isEqualOr}}  
53 - {{/if}}  
54 - 38 + {{/isEqualOr}}
  39 + {{#isEqualOr conf.showVipPrice '1'}}
  40 + <div class="vipprice" style="{{#if conf.vipFontColor}}color:{{conf.vipFontColor}};{{/if}}{{#if conf.vipBgColor}}background:{{conf.vipBgColor}};{{/if}}">
  41 + <span class="vip-price-text">VIP价</span>
  42 + <span class="vip-price-val">¥{{vipprice}}</span>
  43 + </div>
  44 + {{/isEqualOr}}
55 </div> 45 </div>
56 <img class="brand-img" src="{{image2 conf.brandImg q=85}}"> 46 <img class="brand-img" src="{{image2 conf.brandImg q=85}}">
57 </a> 47 </a>
@@ -26,29 +26,20 @@ @@ -26,29 +26,20 @@
26 <p class="product-name">{{productname}}</p> 26 <p class="product-name">{{productname}}</p>
27 {{/isEqualOr}} 27 {{/isEqualOr}}
28 <div class="product-detail-text"> 28 <div class="product-detail-text">
29 - {{#if collageprice}}  
30 - <div class="price collage-price" style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}">  
31 - <span class="sale-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{collageprice}}</span> 29 + {{#isEqualOr conf.showSalePrice '1'}}
  30 + <div class="price" style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}">
  31 + <span class="sale-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{saleprice}}</span>
32 {{#if marketprice}} 32 {{#if marketprice}}
33 <span class="market-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{marketprice}}</span> 33 <span class="market-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{marketprice}}</span>
34 {{/if}} 34 {{/if}}
35 </div> 35 </div>
36 - {{else}}  
37 - {{#isEqualOr conf.showSalePrice '1'}}  
38 - <div class="price" style="{{#if conf.salePriceBgColor}}background:{{conf.salePriceBgColor}};{{/if}}">  
39 - <span class="sale-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{saleprice}}</span>  
40 - {{#if marketprice}}  
41 - <span class="market-price"{{#if conf.fontColor}} style="color:{{conf.fontColor}};" {{/if}}>¥{{marketprice}}</span>  
42 - {{/if}}  
43 - </div>  
44 - {{/isEqualOr}}  
45 - {{#isEqualOr conf.showVipPrice '1'}}  
46 - <div class="vipprice" style="{{#if conf.vipFontColor}}color:{{conf.vipFontColor}};{{/if}}{{#if conf.vipBgColor}}background:{{conf.vipBgColor}};{{/if}}">  
47 - <span class="vip-price-text">VIP价</span>  
48 - <span class="vip-price-val">¥{{vipprice}}</span>  
49 - </div>  
50 - {{/isEqualOr}}  
51 - {{/if}} 36 + {{/isEqualOr}}
  37 + {{#isEqualOr conf.showVipPrice '1'}}
  38 + <div class="vipprice" style="{{#if conf.vipFontColor}}color:{{conf.vipFontColor}};{{/if}}{{#if conf.vipBgColor}}background:{{conf.vipBgColor}};{{/if}}">
  39 + <span class="vip-price-text">VIP价</span>
  40 + <span class="vip-price-val">¥{{vipprice}}</span>
  41 + </div>
  42 + {{/isEqualOr}}
52 </div> 43 </div>
53 </a> 44 </a>
54 {{#if conf.brandImg}} 45 {{#if conf.brandImg}}
1 <!--活动模板分享领券组件--> 1 <!--活动模板分享领券组件-->
2 <div class="web-share"> 2 <div class="web-share">
3 - {{log .}}  
4 {{#webShare}} 3 {{#webShare}}
5 -  
6 <a href="javascript:void(0)" class="web-share-button" data-stid="{{../share_template_id}}" data-scoupon="{{../share_condition}}" 4 <a href="javascript:void(0)" class="web-share-button" data-stid="{{../share_template_id}}" data-scoupon="{{../share_condition}}"
7 data-spic="{{pic}}" data-sdesc="{{content}}" data-stitle="{{title}}" data-surl="{{url}}" data-slanding="{{../landing_attr}}"></a> 5 data-spic="{{pic}}" data-sdesc="{{content}}" data-stitle="{{title}}" data-surl="{{url}}" data-slanding="{{../landing_attr}}"></a>
8 {{/webShare}} 6 {{/webShare}}
1 { 1 {
2 "name": "yohobuywap-node-activity", 2 "name": "yohobuywap-node-activity",
3 - "version": "6.9.9-3", 3 + "version": "6.9.9-4",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {