fe / yohobuy-node · Commits

Go to a project

Authored by 姜枫
Commit 9c0c375a71cbfa4c744f86fccace237b61c45615 1 parent a83eb7eb

handle merge

Inline Side-by-side
Showing 5 changed files with 88 additions and 86 deletions
... ... @@ -57,19 +57,20 @@ exports.getNewArrival = (req, res, next) => {
}).catch(next);
};
exports.getIndexGuide = (req, res,next) => {
exports.getIndexGuide = (req, res, next) => {
channelModel.getIndexGuideData().then(data => {
console.log(data);
if(data.code !== 200){
if (data.code !== 200) {
const err = new Error('异常');
throw err;
}
return channelModel.formatIndexGuideData(data.data);
}).then(data => {
data.layout = false;
//console.log('-----');
//console.log(data);
res.render('guide', {list: data});
}).catch(next);
}
// console.log('-----');
// console.log(data);
res.render('guide', {list: data});
}).catch(next);
};
... ...
/**
* sub app girls
* @author: biao<bill.zhao@yoho.cn>
* @date: 2016/05/16
*/
var express = require('express'),
path = require('path'),
hbs = require('express-handlebars');
var app = express();
// set view engin
var doraemon = path.join(__dirname, '../../doraemon/views'); // parent view root
var partials = path.join(__dirname, './views'); // parent view root
app.on('mount', function(parent) {
delete parent.locals.settings; // 不继承父 App 的设置
Object.assign(app.locals, parent.locals);
});
app.set('views', path.join(__dirname, 'views/action'));
app.engine('.hbs', hbs({
extname: '.hbs',
defaultLayout: 'layout',
layoutsDir: doraemon,
partialsDir: [`${partials}/partial`, `${doraemon}/partial`],
helpers: global.yoho.helpers
}));
// router
app.use(require('./router'));
module.exports = app;
/**
* sub app girls
* @author: biao<bill.zhao@yoho.cn>
* @date: 2016/05/16
*/
var express = require('express'),
path = require('path'),
hbs = require('express-handlebars');
var app = express();
// set view engin
var doraemon = path.join(__dirname, '../../doraemon/views'); // parent view root
var partials = path.join(__dirname, './views'); // parent view root
app.on('mount', function(parent) {
delete parent.locals.settings; // 不继承父 App 的设置
Object.assign(app.locals, parent.locals);
});
app.set('views', path.join(__dirname, 'views/action'));
app.engine('.hbs', hbs({
extname: '.hbs',
defaultLayout: 'layout',
layoutsDir: doraemon,
partialsDir: [`${partials}/partial`, `${doraemon}/partial`],
helpers: global.yoho.helpers
}));
// router
app.use(require('./router'));
module.exports = app;
... ...
... ... @@ -628,7 +628,7 @@ const _formatParams = (channel, data) => {
params.sales = 'Y'; // 只搜索销售的产品
params.outlets = 2; // 非奥莱商品
params.stocknumber = 1; // 过滤掉已售罄的商品
params.attribute_not = 2; //过滤掉赠品
params.attribute_not = 2; // 过滤掉赠品
if (!data.order) {
params.order = orderMaps.s_t_desc;
} else {
... ... @@ -655,7 +655,7 @@ const _formatParams = (channel, data) => {
return result;
});
}
};
/**
* 格式化频道页首次登陆导航数据
... ... @@ -687,9 +687,9 @@ const formatIndexGuideData = data => {
});
if (channels[channel]) {
promiseArr.push(_formatParams(channel, channels[channel]))
promiseArr.push(_formatParams(channel, channels[channel]));
}
})
});
return Promise.all(promiseArr).then(data => {
_.forEach(formatData, (item, index) => {
... ... @@ -697,12 +697,13 @@ const formatIndexGuideData = data => {
if (formatData[index].channel === data[ind].channel) {
formatData[index].num = data[ind].total;
}
})
})
});
});
return formatData;
});
}
};
/**
* 获取最新上架商品数据
*
... ... @@ -845,23 +846,23 @@ exports.getResourceData = (formatData) => {
_.forEach(data, item => {
if (item.content_code) {
promiseArr.push(_formatResourceParams(content_code))
promiseArr.push(_formatResourceParams(content_code));
}
return Promise.all(promiseArr).then(data => {
//console.log(formatData);
// console.log(formatData);
_.forEach(formatData, (item, index) => {
_.forEach(data, (item, ind) => {
if (formatData[index].channel === data[ind].channel) {
formatData[index].src = data[ind].src;
}
})
})
});
});
console.log(formatData);
return formatData;
})
})
}
});
});
};
/**
* 获取频道页首次登陆导航数据
... ... @@ -875,7 +876,7 @@ const getIndexGuideData = () => {
};
return serviceApi.get('operations/api/v6/category/getCategory', params);
}
};
module.exports = {
getNewArrival: getNewArrival,
... ...
/**
* router of sub app girls
* @author: biao<bill.zhao@yoho.cn>
* @date: 2016/05/16
*/
'use strict';
/**
* router of sub app girls
* @author: biao<bill.zhao@yoho.cn>
* @date: 2016/05/16
*/
'use strict';
const router = require('express').Router(); // eslint-disable-line
const cRoot = './controllers';
// Your controller here
const channelController = require(`${cRoot}/index`);
// 频道页路由
router.get('/', channelController.index);
router.get('/woman', channelController.index);
router.get('/kids', channelController.index);
router.get('/lifestyle', channelController.index);
// ajax
router.get('/getbrandFloorDataAjax', channelController.getbrandFloorDataAjax);
router.post('/common/getNewArrival', channelController.getNewArrival);
router.get('/guide', channelController.getIndexGuide);
module.exports = router;
const cRoot = './controllers';
// Your controller here
const channelController = require(`${cRoot}/index`);
// 频道页路由
router.get('/', channelController.index);
router.get('/woman', channelController.index);
router.get('/kids', channelController.index);
router.get('/lifestyle', channelController.index);
// ajax
router.get('/getbrandFloorDataAjax', channelController.getbrandFloorDataAjax);
router.post('/common/getNewArrival', channelController.getNewArrival);
router.get('/guide', channelController.getIndexGuide);
module.exports = router;
... ...
... ... @@ -473,7 +473,7 @@ function actionCover() {
expires: 7
});
closeCover();
})
});
$('#cover .guide-box .close').bind('click', function(event) {
getSource('弹窗', 'CLOSE', 'homepage_man');
window.setCookie('_Gender', '1,3', {
... ... @@ -528,6 +528,6 @@ function actionCover() {
});
});
}
};
}
actionCover();
... ...