Authored by 周少峰

top banner

... ... @@ -21,10 +21,11 @@ exports.index = (req, res, next) => {
studentsModel.getStudentsData(channel).then(result => {
let responseData = studentsModel.getTestData(channel);
// let responseData = studentsModel.getTestData(channel);
let responseData = {};
Object.assign(responseData, result);
res.render('students/index', responseData);
}).catch(next);
... ...
... ... @@ -29,8 +29,6 @@ const studentsCode = '989396a17443bf61e3e269702e51ef04'; // h5 a83b7d55324fb65f9
* @return name returnType 返回值描述
*/
exports.getStudentsData = (channel) => {
let finalResult = {};
return api.all([
headerModel.requestHeaderData(channel),
serviceApi.get('operations/api/v5/resource/get', {content_code: studentsCode})
... ... @@ -46,10 +44,9 @@ exports.getStudentsData = (channel) => {
// 资源位数据
if (result[1].code === 200) {
Object.assign(responseData, stuHandler.studentResource(result[0].data));
Object.assign(responseData, stuHandler.studentResource(result[1].data));
}
console.log(result);
return finalResult;
return responseData;
});
};
... ...
... ... @@ -17,8 +17,8 @@ module.exports = {
domains: {
// api: 'http://devapi.yoho.cn:58078/',
// service: 'http://devservice.yoho.cn:58077/',
api: 'http://testapi.yoho.cn:28078/',
service: 'http://testservice.yoho.cn:28077/',
api: 'http://api.yoho.cn/',
service: 'http://service.yoho.cn/',
search: 'http://192.168.102.216:8080/yohosearch/'
},
subDomains: {
... ...