fe / yohobuywap-node · Commits

Go to a project

Authored by 王水玲
Commit 9d216dd6d9da64f428606ed9de93fda5c67f0792 1 parent a5adbe56

活动模版修改

Inline Side-by-side
Showing 4 changed files with 25 additions and 7 deletions
@@ -110,8 +110,8 @@ class featureModel extends global.yoho.BaseModel { @@ -110,8 +110,8 @@ class featureModel extends global.yoho.BaseModel {
110 f.component[0].type === 'productGroup' && f.component[0].defaultSkns) { 110 f.component[0].type === 'productGroup' && f.component[0].defaultSkns) {
111 sknsArr.push(self._getProductBySkns(f.component[0], self.ctx)); 111 sknsArr.push(self._getProductBySkns(f.component[0], self.ctx));
112 112
113 - f.component[0].newStyle = _.get(f, 'component[0].newStyle') === '1';  
114 f.component[0].isStyle2 = _.get(f, 'component[0].newStyle') === '2' && _.get(f, 'component[0].numOfOneRow') === '2';// eslint-disable-line 113 f.component[0].isStyle2 = _.get(f, 'component[0].newStyle') === '2' && _.get(f, 'component[0].numOfOneRow') === '2';// eslint-disable-line
  114 + f.component[0].newStyle = _.get(f, 'component[0].newStyle') === '1';
115 } 115 }
116 116
117 if (f.component && f.component[0] && 117 if (f.component && f.component[0] &&
@@ -121,8 +121,8 @@ class featureModel extends global.yoho.BaseModel { @@ -121,8 +121,8 @@ class featureModel extends global.yoho.BaseModel {
121 limit: '60' 121 limit: '60'
122 }, f.component[0].searchCondition || {}); 122 }, f.component[0].searchCondition || {});
123 123
124 - f.component[0].newStyle = _.get(f, 'component[0].newStyle') === '1';  
125 f.component[0].isStyle2 = _.get(f, 'component[0].newStyle') === '2' && _.get(f, 'component[0].numOfOneRow') === '2';// eslint-disable-line 124 f.component[0].isStyle2 = _.get(f, 'component[0].newStyle') === '2' && _.get(f, 'component[0].numOfOneRow') === '2';// eslint-disable-line
  125 + f.component[0].newStyle = _.get(f, 'component[0].newStyle') === '1';
126 } 126 }
127 127
128 // 新增店铺组 128 // 新增店铺组
@@ -27,13 +27,20 @@ @@ -27,13 +27,20 @@
27 {{#if marketprice}} 27 {{#if marketprice}}
28 <span class="market-price"{{#if ../fontColor}} style="color:{{../fontColor}};" {{/if}}>¥{{marketprice}}</span> 28 <span class="market-price"{{#if ../fontColor}} style="color:{{../fontColor}};" {{/if}}>¥{{marketprice}}</span>
29 {{/if}} 29 {{/if}}
  30 + {{#isEqualOr ../showVipPrice '1'}}
  31 + {{#if ../isStyle2}}
  32 + <span class="vip"></span>
  33 + {{/if}}
  34 + {{/isEqualOr}}
30 </div> 35 </div>
31 {{/isEqualOr}} 36 {{/isEqualOr}}
32 {{#isEqualOr ../showVipPrice '1'}} 37 {{#isEqualOr ../showVipPrice '1'}}
33 - <div class="vipprice" style="{{#if ../vipFontColor}}color:{{../vipFontColor}};{{/if}}{{#if ../vipBgColor}}background:{{../vipBgColor}};{{/if}}">  
34 - <span class="vip-price-text">VIP价</span>  
35 - <span class="vip-price-val">¥{{vipprice}}</span>  
36 - </div> 38 + {{#unless ../isStyle2}}
  39 + <div class="vipprice" style="{{#if ../vipFontColor}}color:{{../vipFontColor}};{{/if}}{{#if ../vipBgColor}}background:{{../vipBgColor}};{{/if}}">
  40 + <span class="vip-price-text">VIP价</span>
  41 + <span class="vip-price-val">¥{{vipprice}}</span>
  42 + </div>
  43 + {{/unless}}
37 {{/isEqualOr}} 44 {{/isEqualOr}}
38 </div> 45 </div>
39 </a> 46 </a>
@@ -273,17 +273,28 @@ @@ -273,17 +273,28 @@
273 273
274 .price { 274 .price {
275 text-align: left; 275 text-align: left;
276 - font-size: 26px;  
277 letter-spacing: 0; 276 letter-spacing: 0;
278 margin-top: 10px; 277 margin-top: 10px;
279 } 278 }
280 279
281 .sale-price { 280 .sale-price {
282 color: #d0021b; 281 color: #d0021b;
  282 + font-size: 26px;
283 } 283 }
284 284
285 .market-price { 285 .market-price {
286 color: #b0b0b0; 286 color: #b0b0b0;
  287 + font-size: 26px;
  288 + }
  289 +
  290 + .vip {
  291 + background: resolve("activity/vip@2x.png") no-repeat;
  292 + background-size: cover;
  293 + width: 60px;
  294 + height: 40px;
  295 + display: inline-block;
  296 + vertical-align: top;
  297 + margin-left: 3px;
287 } 298 }
288 } 299 }
289 } 300 }