fe / yohobuy-node · Commits

Go to a project

Authored by 周少峰
Commit 7045116335284c191fbacc2787de9a1ead1465dc 2 parents 5c963b91 9a059799

Merge branch 'release/4.6' of http://git.yoho.cn/fe/yohobuy-node into release/4.6

Inline Side-by-side
Showing 4 changed files with 18 additions and 33 deletions
... ... @@ -86,27 +86,19 @@ exports.getSaleGoodsData = (params) => {
switch (userInfo.curLevel) {
case '1':
finalResult.goods[key] = {
salePrice: value.vip1Price,
vip1: true
};
finalResult.goods[key].salePrice = value.vip1_price;
finalResult.goods[key].vip1 = true;
break;
case '2':
finalResult.goods[key] = {
salePrice: value.vip2Price,
vip2: true
};
finalResult.goods[key].salePrice = value.vip2_price;
finalResult.goods[key].vip2 = true;
break;
case '3':
finalResult.goods[key] = {
salePrice: value.vip3Price,
vip3: true
};
finalResult.goods[key].salePrice = value.vip3_price;
finalResult.goods[key].vip3 = true;
break;
default:
finalResult.goods[key] = {
vip: true
};
finalResult.goods[key].vip = true;
delete finalResult.goods[key].salesPrice;
break;
}
... ... @@ -332,27 +324,19 @@ exports.getSaleOthersData = (params, channel) => {
switch (userInfo.curLevel) {
case '1':
finalResult.goods[key] = {
salePrice: value.vip1_price,
vip1: true
};
finalResult.goods[key].salePrice = value.vip1_price;
finalResult.goods[key].vip1 = true;
break;
case '2':
finalResult.goods[key] = {
salePrice: value.vip2_price,
vip2: true
};
finalResult.goods[key].salePrice = value.vip2_price;
finalResult.goods[key].vip2 = true;
break;
case '3':
finalResult.goods[key] = {
salePrice: value.vip3_price,
vip3: true
};
finalResult.goods[key].salePrice = value.vip3_price;
finalResult.goods[key].vip3 = true;
break;
default:
finalResult.goods[key] = {
vip: true
};
finalResult.goods[key].vip = true;
delete finalResult.goods[key].salesPrice;
break;
}
... ...
... ... @@ -12,7 +12,7 @@
<div class="time"><span class="time-span"><span class="iconfont">&#xe60a;</span>{{time}}</span></div>
</div>
<div class="detail">
<img class="brand pull-left" src="{{image brand 150 70}}">
<img class="brand pull-left" src="{{image brand 185 86}}">
<div class="text">
<div class="discount">
<span class="num">{{discount}}</span>
... ...
This diff could not be displayed because it is too large.
... ... @@ -174,7 +174,7 @@
}
.brand {
margin: 24px 10px 10px;
margin: 10px;
}
.text {
... ... @@ -655,7 +655,8 @@
line-height: 20px;
color: #fff;
font-style: italic;
margin-top: -3px;
position: relative;
top: -3px;
margin-right: 5px;
margin-left: 10px;
padding-right: 5px;
... ...