fe / yohobuywap-node · Commits

Go to a project

Authored by yyq
Commit 1e873313e94b0c58f73d5d517de838a4521a4a7e 2 parents 0b4b7f95 343d8506

Merge remote-tracking branch 'origin/hotfix/activity-tmp' into release/0829

Inline Side-by-side
Showing 3 changed files with 14 additions and 8 deletions
... ... @@ -107,10 +107,15 @@ class featureModel extends global.yoho.BaseModel {
if (data && data.floors) {
data.floors.forEach(f => {
if (f.component && f.component[0] &&
f.component[0].type === 'productGroup') {
f.component[0].isStyle2 = _.get(f, 'component[0].newStyle') === '2' && _.get(f, 'component[0].numOfOneRow') === '2';// eslint-disable-line
}
if (f.component && f.component[0] &&
f.component[0].type === 'productGroup' && f.component[0].defaultSkns) {
sknsArr.push(self._getProductBySkns(f.component[0], self.ctx));
f.component[0].isStyle2 = _.get(f, 'component[0].newStyle') === '2' && _.get(f, 'component[0].numOfOneRow') === '2';// eslint-disable-line
f.component[0].newStyle = _.get(f, 'component[0].newStyle') === '1';
}
... ... @@ -121,7 +126,6 @@ class featureModel extends global.yoho.BaseModel {
limit: '60'
}, f.component[0].searchCondition || {});
f.component[0].isStyle2 = _.get(f, 'component[0].newStyle') === '2' && _.get(f, 'component[0].numOfOneRow') === '2';// eslint-disable-line
f.component[0].newStyle = _.get(f, 'component[0].newStyle') === '1';
}
... ...
... ... @@ -30,12 +30,10 @@
</div>
{{/isEqualOr}}
{{#isEqualOr ../showVipPrice '1'}}
{{#unless ../isStyle2}}
<div class="vipprice" style="{{#if ../vipFontColor}}color:{{../vipFontColor}};{{/if}}{{#if ../vipBgColor}}background:{{../vipBgColor}};{{/if}}">
<span class="vip-price-text">VIP价</span>
<span class="vip-price-val">¥{{vipprice}}</span>
</div>
{{/unless}}
<div class="vipprice" style="{{#if ../vipFontColor}}color:{{../vipFontColor}};{{/if}}{{#if ../vipBgColor}}background:{{../vipBgColor}};{{/if}}">
<span class="vip-price-text">VIP价</span>
<span class="vip-price-val">¥{{vipprice}}</span>
</div>
{{/isEqualOr}}
</div>
</a>
... ...
... ... @@ -309,5 +309,9 @@
height: 369px;
}
}
.vipprice {
display: none;
}
}
}
... ...