Authored by 王水玲

活动页

... ... @@ -34,9 +34,11 @@ exports.special = (req, res) => {
// });
Promise.all([headerModel.requestHeaderData(), specialModel.getSpecialData(id)]).then((result) => {
let saleDate = _.assign(result);
res.send(saleDate);
let saleDate = _.assign(result[0], result[1]);
res.send(saleDate);
}).catch((err) => {
saleLogger(err, res);
});
... ...
... ... @@ -7,7 +7,6 @@
const ServiceAPI = require(`${global.library}/api`).ServiceAPI;
const sign = require(`${global.library}/sign`);
const _ = require('lodash');
var api = new ServiceAPI();
... ... @@ -16,9 +15,9 @@ exports.getSpecialData = (id) => {
id: id
})).then(result => {
if (result && result.code === 200) {
return result.data
return result.data;
} else {
return Promise.reject('error');
}
});
}
\ No newline at end of file
};
... ...