fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit 17d7272029bdbbfb22051c7286554edaee0e14b3 1 parent ac04188d

sale

Inline Side-by-side
Showing 2 changed files with 23 additions and 29 deletions
... ... @@ -76,17 +76,14 @@ exports.vip = (req, res, next) => {
params.uid = req.user.uid || 0;
let responseData = {
module: 'product',
page: 'sale'
};
sale.getSaleOthersData(params, channel).then((result) => {
responseData.saleList = result;
if (result) {
responseData.headerData = result.headerData;
}
res.render('sale/other', responseData);
res.render('sale/other', Object.assign({
module: 'product',
page: 'sale'
}, {
saleList: result,
headerData: result.headerData
}));
}).catch(next);
};
... ... @@ -104,17 +101,14 @@ exports.newSale = (req, res, next) => {
let channel = req.query.channel || req.cookies._Channel || 'boys';
let responseData = {
module: 'product',
page: 'sale'
};
sale.getSaleOthersData(params, channel).then((result) => {
responseData.saleList = result;
if (result) {
responseData.headerData = result.headerData;
}
res.render('sale/other', responseData);
res.render('sale/other', Object.assign({
module: 'product',
page: 'sale'
}, {
saleList: result,
headerData: result.headerData
}));
}).catch(next);
};
... ... @@ -156,7 +150,7 @@ exports.getGoodsList = (req, res, next) => {
params.uid = req.user.uid || 0;
return sale.getSaleGoodsData(params).then(result => {
sale.getSaleGoodsData(params).then(result => {
let responseData = {};
responseData.footerTop = false;
... ...
... ... @@ -83,20 +83,20 @@ exports.getSaleGoodsData = (params) => {
switch (vipInfo.cur_level) {
case '1':
finalResult.goods[key].salesPrice = value.vip1Price;
finalResult.goods[key].sales_price = value.vip1_price;
finalResult.goods[key].vip1 = true;
break;
case '2':
finalResult.goods[key].salesPrice = value.vip2Price;
finalResult.goods[key].sales_price = value.vip2_price;
finalResult.goods[key].vip2 = true;
break;
case '3':
finalResult.goods[key].salesPrice = value.vip3Price;
finalResult.goods[key].sales_price = value.vip3_price;
finalResult.goods[key].vip3 = true;
break;
default:
finalResult.goods[key].vip = true;
delete finalResult.goods[key].salesPrice;
delete finalResult.goods[key].sales_price;
break;
}
... ... @@ -407,8 +407,8 @@ exports.getSaleDiscountData = (params, channel) => {
finalResult.saleList.goods = productProcess.processProductList(subResult[1].data.product_list);
finalResult.saleList.totalCount = subResult[1].data.total;
_.forEach(finalResult.saleList.goods, (value, key) => {
delete finalResult.saleList.goods[key].tags.isNew; // 屏蔽 new 标签
delete finalResult.saleList.goods[key].tags.isSale;// 屏蔽 sale 标签
delete finalResult.saleList.goods[key].tags.is_new; // 屏蔽 new 标签
delete finalResult.saleList.goods[key].tags.is_sale;// 屏蔽 sale 标签
delete finalResult.saleList.goods[key].discount; // 屏蔽折扣信息
});
} else {
... ... @@ -502,8 +502,8 @@ exports.getSalebreakingYardsData = (params, channel) => {
};
_.forEach(finalResult.goods, (value, key) => {
delete finalResult.goods[key].tags.isNew; // 屏蔽 new 标签
delete finalResult.goods[key].tags.isSale;// 屏蔽 sale 标签
delete finalResult.goods[key].tags.is_new; // 屏蔽 new 标签
delete finalResult.goods[key].tags.is_sale;// 屏蔽 sale 标签
delete finalResult.goods[key].discount; // 屏蔽折扣信息
});
} else {
... ...