Authored by yyq

Merge branch 'master' of git.yoho.cn:fe/yohobuy-node

... ... @@ -326,7 +326,7 @@ const _getBoysSingleHot = (args, type) => {
* @param {String} type 频道类型
* @return {Object}
*/
const _getGirlsSingleHot = args => {
const _getGirlsSingleHot = (args, type) => {
let goods = args[2] && args[2].data;
let skns = '';
... ... @@ -338,7 +338,6 @@ const _getGirlsSingleHot = args => {
return;
}
return searchApi.get('/search.json', {
client_type: 'web',
query: skns,
... ... @@ -348,6 +347,7 @@ const _getGirlsSingleHot = args => {
attribute_not: '2',
stocknumber: 1,
page: 1,
gender: channelMap[type].gender,
viewNum: 60
});
};
... ...
<script>
window.onload = function() {
var hm = document.createElement("script");
hm.src = "http://static.criteo.net/js/ld/ld.js";
hm.src = "//static.criteo.net/js/ld/ld.js";
hm.async = 1;
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
... ...
... ... @@ -17,14 +17,14 @@ const channelMap = {
},
kids: {
code: 'd71f4b27f2a7229fbb31a4bc490a6f36',
gender: '2,3'
gender: ''
},
lifestyle: {
code: '8a341ca7eacc069ba80f02dec80eaf34',
// code: '380c38155fd8beee10913a3f5b462da6',
// code: '665f7c2fb9d037ee820766953ee34bf7',
gender: '2,3'
gender: ''
}
};
... ...
... ... @@ -56,7 +56,7 @@
"uuid": "^2.0.2",
"winston": "^2.2.0",
"winston-daily-rotate-file": "^1.1.4",
"yoho-node-lib": "0.0.10"
"yoho-node-lib": "0.0.12"
},
"devDependencies": {
"autoprefixer": "^6.3.6",
... ...