Authored by 陈峰

Merge branch 'qCloud' of http://git.yoho.cn/fe/yohobuywap-node into qCloud

... ... @@ -47,6 +47,8 @@ app.use(global.yoho.hbs({
helpers: global.yoho.helpers
}));
app.use(global.yoho.middleware());
app.use(favicon(path.join(__dirname, '/public/favicon.ico')));
app.use(express.static(path.join(__dirname, 'public')));
app.use(bodyParser.json());
... ...
... ... @@ -249,7 +249,7 @@ const _getContent = (data, params, isApp, appVersion) => {
}
// tar note 处理楼层标题
if (fun === 'getCoupon' && _.has(data[i - 1], 'template_name') && data[i - 1].template_name === 'text') {
if (fun === 'getCoupon' && data[i].data.length && _.has(data[i - 1], 'template_name') && data[i - 1].template_name === 'text') {
data[i].data[0].floorTitle = data[i - 1].data;
}
build = processFun[fun](data[i].data, isApp);
... ...
'use strict';
const api = global.yoho.API;
const logger = global.yoho.logger;
const utils = '../../../utils';
const productProcess = require(`${utils}/product-process`);
... ... @@ -29,8 +28,6 @@ const mayLike = (uid, page, limit, gender, udid, recPos, channel) => {
}
}
} else {
logger.error('mayLike cood 不是 200');
}
});
};
... ... @@ -54,8 +51,6 @@ const mayLikeKids = (page, limit, channel) => {
return productProcess.processProductList(result.data.product_list);
}
} else {
logger.error('mayLikeKids cood 不是 200');
}
});
};
... ...
... ... @@ -38,7 +38,7 @@
"request-promise": "^3.0.0",
"serve-favicon": "^2.3.0",
"uuid": "^2.0.3",
"yoho-node-lib": "0.1.13"
"yoho-node-lib": "0.1.18"
},
"devDependencies": {
"autoprefixer": "^6.3.7",
... ...