Authored by 周少峰

Merge branch 'hotfix/studentsIE'

... ... @@ -61,7 +61,7 @@ module.exports = {
udp: { // send by udp
measurement: 'yohobuy_node_log',
level: 'debug', // logger level
host: 'influxdblog.yohoops.org', // influxdb host
host: 'influxdblog.web.yohoops.org', // influxdb host
port: '4444' // influxdb port
},
console: {
... ... @@ -126,7 +126,7 @@ if (isProduction) {
open: false,
url: 'http://123.206.2.55/strategy'
},
zookeeperServer: '10.66.1.97:2181'
zookeeperServer: 'zookeeper.web.yohoops.org:2181'
});
} else if (isTest) {
Object.assign(module.exports, {
... ...
{
"name": "yohobuy-node",
"version": "5.1.3",
"version": "5.1.4",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ... @@ -53,8 +53,8 @@
"request-ip": "^1.2.2",
"serve-favicon": "^2.3.0",
"uuid": "^2.0.2",
"yoho-node-lib": "0.1.29",
"yoho-zookeeper": "^1.0.3"
"yoho-node-lib": "0.1.30",
"yoho-zookeeper": "^1.0.4"
},
"devDependencies": {
"autoprefixer": "^6.3.6",
... ...
... ... @@ -162,6 +162,7 @@ function clearSelectUl($a, code) {
$input.val($a.html());
}
$ul.empty();
$ul.addClass('hide');
$wrap.removeClass('active');
}
... ... @@ -227,6 +228,7 @@ function loadSelectLi(jsonData, param) {
if (data.code === 200) {
fnJson[jsonData.keyData] = data.data;
jsonData.$ul.html(provFn(fnJson));
jsonData.$ul.removeClass('hide');
} else if (data.code === 403) {
location.href = data.data.url;
}
... ... @@ -426,6 +428,7 @@ $stuYear.on('click', function() {
for (i = year - 7; i <= year; i++) {
yearArr.push(i);
}
$ul.removeClass('hide');
$ul.html(provFn({
yearData: yearArr
}));
... ...
... ... @@ -170,6 +170,10 @@ exports.processProductList = (list, options) => {
// 判别默认的商品是否将默认的图片URL赋值到skn
let flag = false;
_.remove(product.goods_list, function(n) {
return !+n.status;
});
// 如果设置了默认图片,就取默认的图片
_.forEach(product.goods_list, (goods) => {
if (flag) {
... ...