Authored by ccbikai(👎🏻🍜)

Merge remote-tracking branch 'origin/hotfix/unf-bug' into gray

... ... @@ -289,10 +289,17 @@ exports.checkBefore = (req, res, next) => {
// AJAX 校验验证码 in step2
exports.check = (req, res, next) => {
const code = req.query.code;
const mobile = req.session.smsLogin.mobile;
const area = req.session.smsLogin.area;
const mobile = _.get(req.session, 'smsLogin.mobile', '');
const area = _.get(req.session, 'smsLogin.area', '');
const shopping_key = cookie.getShoppingKey(req); // eslint-disable-line
if (!mobile || !area) {
res.json({
code: 401,
message: VERIFY_ERROR
});
return;
}
Promise.all([
PhoneService.checkUserPhoneExist(mobile, area),
... ...
... ... @@ -230,7 +230,7 @@ const _getUserProfile = (uid) => {
*/
const _getResources = (page, channel) => {
return serviceAPI.get('operations/api/v5/resource/get', {
content_code: contentCode[channel][page]
content_code: _.get(contentCode, `${channel}.${page}`, '')
}, {
cache: true
}).then((result) => {
... ...