Authored by biao

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

... ... @@ -53,7 +53,7 @@ app.use(session({
secret: '82dd7e724f2c6870472c89dfa43cf48d',
name: 'yohobuy_session',
cookie: {
// domain: 'yohobuy.com',
domain: 'yohobuy.com',
httpOnly: false
},
store: new MemcachedStore({
... ...
... ... @@ -56,51 +56,58 @@ class Star {
list = camelCase(list);
// 首页资源位数据处理
_.forEach(list.ads.data, (data) => {
formatData.ads.push({
src: data.src,
url: data.url
if (list.ads) {
_.forEach(list.ads.data, (data) => {
formatData.ads.push({
src: data.src,
url: data.url
});
});
});
}
// 首页明星文章数据处理
_.forEach(list.list, (data) => {
const avatar = {
tags: []
};
if (data.ext.tags.length > 1) {
avatar.isSwiper = true;
}
if (list.list) {
_.forEach(list.list, (data) => {
const avatar = {
tags: []
};
if (data.ext.tags.length > 1) {
avatar.isSwiper = true;
}
_.forEach(data.ext.tags, (tags) => {
avatar.tags.push({
avatarUrl: `/guang/star/detail?tag=${tags.tagName}`,
cover: tags.cover,
tagName: tags.tagName
_.forEach(data.ext.tags, (tags) => {
avatar.tags.push({
avatarUrl: `/guang/star/detail?tag=${tags.tagName}`,
cover: tags.cover,
tagName: tags.tagName
});
});
formatData.articles.push(_.merge({
id: data.id,
url: data.url,
title: data.title,
articeTxt: data.intro,
src: data.src,
publishTime: helpers.dateFormat('MM月DD日 hh:mm', data.publishTime),
viewsNum: data.viewsNum
}, avatar));
});
}
formatData.articles.push(_.merge({
id: data.id,
url: data.url,
title: data.title,
articeTxt: data.intro,
src: data.src,
publishTime: helpers.dateFormat('MM月DD日 hh:mm', data.publishTime),
viewsNum: data.viewsNum
}, avatar));
});
// 首页明星头像数据处理
_.forEach(list.tags, (data) => {
let url = `/guang/star/detail?tag=${data.tagName}`;
if (list.tags) {
_.forEach(list.tags, (data) => {
let url = `/guang/star/detail?tag=${data.tagName}`;
formatData.starAvatar.push({
url: url,
cover: data.cover
formatData.starAvatar.push({
url: url,
cover: data.cover
});
});
});
}
return formatData;
}
... ...
... ... @@ -134,7 +134,6 @@ function initFilter(opt) {
$cur;
e.preventDefault();// 防止透点
e.stopPropagation();
if ($this.closest('.filter-body').length > 0) {
$cur = $this.closest('.sub-item');
... ...