fe / yohobuy-node · Commits

Go to a project

Authored by 周少峰
Commit 656bbe7d7bbfbd1bd801c0cd5d17f82d42c21d39 2 parents c7fa9a01 ac933e8a master ... baidu_ocpcapi develop feature/canbuy feature/channelDataMap feature/company-profile feature/contact feature/detail-link feature/home-optimize feature/overseas-edition feature/payment feature/pcurl feature/reduce feature/refactor_alert feature/shoppingPay feature/virtualOrder hotfix/11 hotfix/cart hotfix/changeappversion hotfix/gift hotfix/im hotfix/link hotfix/ocpc hotfix/shop hotfix/upload hotfix/yohobi release/6.9.0 release/6.9.2 2019-12-5 all

Merge branch 'gray'

Inline Side-by-side
Showing 33 changed files with 2176 additions and 1736 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 33 of 33+ files are displayed.

... ... @@ -47,6 +47,7 @@ global.appRoot = path.resolve(__dirname);
// 向模板注入变量
app.locals.devEnv = app.get('env') === 'development';
app.locals.isProduction = app.get('env') === 'production';
app.locals.version = pkg.version;
// zookeeper
... ... @@ -62,6 +63,10 @@ if (!app.locals.devEnv) {
}
app.set('subdomain offset', 2);
// 添加请求上下文
app.use(global.yoho.httpCtx());
app.use(global.yoho.hbs({
extname: '.hbs',
defaultLayout: 'layout',
... ...
... ... @@ -53,6 +53,7 @@ const bundleNum = (params) => {
const cartData = (uid, shoppingKey) => {
let param = {
is_support_mlp: 'Y',
method: 'app.Shopping.queryCart' // old: 'app.Shopping.cart'
};
... ... @@ -116,6 +117,7 @@ const selectGoods = (uid, sku, shoppingKey /* , hasPromotion*/) => {
let param = {
// method: hasPromotion ? 'app.Shopping.selectedAndCart' : 'app.Shopping.selected',
is_support_mlp: 'Y',
method: 'app.Shopping.selectedAndQryCart',
product_sku_list: sku
};
... ... @@ -144,13 +146,19 @@ const selectGoods = (uid, sku, shoppingKey /* , hasPromotion*/) => {
const removeFromCart = (uid, shoppingKey, skuList, hasPromotion) =>{
let param = {
method: hasPromotion ? 'app.Shopping.removeAndQryCart' : 'app.Shopping.remove',
method: 'app.Shopping.remove',
product_sku_list: skuList
};
if (hasPromotion) {
param.method = 'app.Shopping.removeAndQryCart';
param.is_support_mlp = 'Y';
}
if (uid) {
param.uid = uid;
}
if (shoppingKey) {
param.shopping_key = shoppingKey;
}
... ... @@ -170,6 +178,7 @@ const addToFav = (uid, skuList /* , hasPromotion*/) =>{
let param = {
// method: hasPromotion ? 'app.Shopping.addfavoriteAndCart' : 'app.Shopping.addfavorite',
is_support_mlp: 'Y',
method: 'app.Shopping.addfavoriteAndQryCart',
product_sku_list: skuList,
uid: uid
... ...
... ... @@ -43,15 +43,10 @@ const transPrice = (price) => {
return price ? (price * 1).toFixed(2) : '0.00';
};
const priceIconReplace = (title) => {
const identIconReplace = (ret) => {
let repstr = '<span style=\'color:#ff575c\'>$&</span>';
let ret = title;
if (ret) {
ret = ret.replace(/￥/g, '¥');
}
return ret;
return ret && ret.replace(/￥/g, '¥').replace(/\d件/g, repstr).replace(/¥[.0-9]*元/g, repstr) || '';
};
/**
... ... @@ -270,7 +265,7 @@ const formatPromotionInfos = (infoList) => {
return {
cutdownAmount: it.cutdown_amount,
promotionId: it.promotion_id,
promotionTitle: priceIconReplace(it.promotion_title),
promotionDesc: identIconReplace(it.promotion_title),
promotionType: it.promotion_type,
tag: PROMOTION_TYPE_TAG_MAP[it.promotion_type]
};
... ... @@ -302,7 +297,8 @@ const formatPriceGiftOne = (it) => {
// isShowGift: isGift, // 控制是否显示赠品
// isFold: true, // 控制是否[展开]
promotionId: it.promotion_id,
promotionTitle: priceIconReplace(it.promotion_title), // + '(注：您看到的商品可能因为下单时间差已售完)', // subjoinType
promotionTitle: it.promotion_title,
promotionDesc: identIconReplace(it.promotion_desc), // + '(注：您看到的商品可能因为下单时间差已售完)', // subjoinType
maxSelectNumber: it.max_select_number,
promotionType: it.promotion_type,
tag: PROMOTION_TYPE_TAG_MAP[it.promotion_type],
... ... @@ -381,20 +377,20 @@ const checkGoodsIsSel = (goodsList, promotionId, selectedGiftsList) => {
*/
const formatPromotion = (it, selectedGiftsList) => {
let status = Number(it.status);
// "status": 0, // 状态 0 未满足 10 已满足 [20 售光 30 更换 ]
let status = parseInt(it.status, 10);
let tsPromotionIds = (it.ts_promotion_ids && it.ts_promotion_ids.join(',')) || it.promotion_id || '';
let info = {
status: status,
// "status": 0, // 状态 0 未满足 10 已满足 [20 售光 30 更换 ]
conditionUnit: it.condition_unit, // 0满足,1 件,2金额
conditionValue: it.condition_value,
giftPrice: it.gift_price, // 赠品或加价购商品价格
giftGoodsList: formatCartGoods(it.gift_goods_List), // 可供选择的赠品或加价购商品列表
promotionId: it.promotion_id, // 促销id
promotionTitle: priceIconReplace(it.promotion_title), // "已满足[满30减10-dev30]",
promotionId: tsPromotionIds, // 促销id
promotionDesc: identIconReplace(it.promotion_desc),
promotionType: it.promotion_type, // 促销类型
// list.yohobuy.com?psp_id=10408
promotionPageUrl: helpers.urlFormat('', { psp_id: it.promotion_id }, 'list'),
promotionPageUrl: helpers.urlFormat('', {psp_id: tsPromotionIds}, 'list'),
tag: PROMOTION_TYPE_TAG_MAP[it.promotion_type],
isGift: it.promotion_type === 'Gift',
... ... @@ -408,42 +404,10 @@ const formatPromotion = (it, selectedGiftsList) => {
// 判断赠品/加价购商品，是否被选中
info.giftGoodsList = checkGoodsIsSel(info.giftGoodsList, info.promotionId, selectedGiftsList);
function toDecimal(x) {
var original = Math.round(Math.abs(x) * 100) / 100;
var s = original.toString();
var rs = s.indexOf('.');
if (rs < 0) {
rs = s.length;
s += '.';
}
while (s.length <= rs + 2) {
s += '0';
}
return s;
}
if (info.isNotReach) {
let tipTxtMoney = `${ toDecimal(info.conditionValue)}`;
let tipTxt = `${ -(Math.round(parseFloat(info.conditionValue) * 100) / 100)}`;
if (info.conditionUnit === 1) {
tipTxt += '件';
} else if (info.conditionUnit === 2) {
tipTxt = tipTxtMoney + '元';
}
tipTxt = '<span style=\'color:#ff575c\'>' + tipTxt + '</span>';
info.promotionTitle = '还差' + tipTxt + '满足&nbsp;&nbsp;&nbsp;' + info.promotionTitle;
} else if (info.isReach) {
info.promotionTitle = '已满足&nbsp;&nbsp;&nbsp;' + info.promotionTitle;
}
if (info.giftGoodsList) {
info.giftGoodsListStr = JSON.stringify(info.giftGoodsList);
}
return info;
};
... ... @@ -644,7 +608,10 @@ const formatCart = (cartDataRet, uid, shoppingKey, cartDelList) => {
ensureUrl: helpers.urlFormat('/cart/ensure'),
// 免运费提示
tips: _.get(ordCartData, 'shipping_cost_prompt.shipping_cost_tips', '')
tips: _.get(ordCartData, 'shipping_cost_prompt.shipping_cost_tips', ''),
// 低档赠品
matchGiftIds: _.get(ordCartData, 'match_gift_ids', []).join(',')
};
let advStat = result.advanceCart.stat;
... ...
... ... @@ -350,6 +350,7 @@ const _detailDataPkg = (origin) => {
result.addToCart = 1;
}
result.isCollect = propOrigin('is_collect');
result.colors = skuData.skuGoods;
return result;
... ... @@ -945,48 +946,53 @@ const queryUserPromotionGift = (promotionId, uid, shoppingKey) => {
let currentProduct = null; // 默认展示第一个商品
if (promotionGifts && promotionGifts.code === 200) {
// chelper.formatPriceGiftOne(promotionGifts.data);
let promotionList = chelper.formatPriceGifts(_.get(promotionGifts, 'data.arrays'));
let promotionList = chelper.formatPriceGifts(_.get(promotionGifts, 'data.arrays', []));
if (promotionList && promotionList.length >= 0) {
promotionGifts.data = promotionList[0];
} else {
promotionGifts.data = {};
}
if (promotionGifts.data.goodsList && promotionGifts.data.goodsList.length) {
currentProduct = promotionGifts.data.goodsList[0];
currentProduct.active = true;
}
promotionGifts.data = _.get(promotionList, '[0]', {});
// 处理是否选中状态
if (selectedGift && selectedGift.length) {
_.forEach(promotionGifts.data.goodsList, (it) => {
let goodsList = [];
let checked;
let isSelected = false;
_.forEach(promotionList, value => {
if (!value.goodsList || !value.goodsList.length) {
return;
}
_.forEach(selectedGift, sg => {
if (it.skn === sg.skn) {
isSelected = true;
return true;
}
_.forEach(value.goodsList, it => {
if (!checked) {
checked = true;
it.active = true;
currentProduct = it;
promotionGifts.data.promotionDesc = value.promotionTitle;
}
Object.assign(it, {
isSelected: !!_.find(selectedGift, ['skn', it.skn]),
promotionId: value.promotionId,
promotionTitle: value.promotionTitle,
maxSelectNumber: value.maxSelectNumber
});
it.isSelected = isSelected;
goodsList.push(it);
});
}
}
});
promotionGifts.data.goodsList = goodsList;
// 获取选中商品的数据详情
if (currentProduct && currentProduct.id) {
promotionGifts.data.productInfo = yield getProductInfoAsync(currentProduct.id);
// 获取选中商品的数据详情
if (currentProduct && currentProduct.id) {
let prodInfo = yield getProductInfoAsync(currentProduct.id);
// 价格为活动价
if (promotionGifts.data.productInfo) {
promotionGifts.data.productInfo.salePrice = '¥' + currentProduct.subjoinPrice;
// 价格为活动价
if (prodInfo) {
prodInfo.salePrice = '¥' + currentProduct.subjoinPrice;
}
promotionGifts.data.productInfo = prodInfo;
}
}
return promotionGifts;
})();
... ...
... ... @@ -8,7 +8,7 @@
const _ = require('lodash');
const guangModel = require('../models/index');
const guangModel = require('../models/guang-service');
const headerModel = require('../../../doraemon/models/header');
const ghelper = require('../models/guang-helper');
const urlHelper = require('../models/url-helper');
... ... @@ -23,20 +23,22 @@ exports.index = (req, res, next) => {
let pageSize = req.query.pageSize || 20;
let type = req.query.type || 0;
let pathNav = guangModel.getPathNav(channel);
let pathNav = req.ctx(guangModel).getPathNav(channel);
let uid = req.user.uid;
let udid = ghelper.getUdid(req, res);
let gender = ghelper.getGenderByCookie(req);
let isHotDegrade = _.get(req.app.locals.pc, 'guang.removeHotTag', false);
let isAdDegrade = _.get(req.app.locals.pc, 'guang.removeAd', false);
const reqCtx = req.ctx(guangModel);
Promise.all([
guangModel.getBanner(channel),
guangModel.getCategory(type, channel),
guangModel.getArticleList(gender, type, uid, udid, page, '', '', pageSize, channel, true),
guangModel.getHotTags(page, pageSize, channel, isHotDegrade),
guangModel.getAds(channel, isAdDegrade),
guangModel.getRecoArticles(gender, 1, 10, channel),
reqCtx.getBanner(channel),
reqCtx.getCategory(type, channel),
reqCtx.getArticleList(gender, type, uid, udid, page, '', '', pageSize, channel, true),
reqCtx.getHotTags(page, pageSize, channel, isHotDegrade),
reqCtx.getAds(channel, isAdDegrade),
reqCtx.getRecoArticles(gender, 1, 10, channel),
headerModel.requestHeaderData(channel)
]).then(ret => {
... ... @@ -85,17 +87,19 @@ exports.tags = (req, res, next) => {
let udid = ghelper.getUdid(req, res);
let gender = ghelper.getGenderByCookie(req);
let channel = req.yoho.channel;
let pathNav = guangModel.getPathNav(channel, query);
let pathNav = req.ctx(guangModel).getPathNav(channel, query);
let isHotDegrade = _.get(req.app.locals.pc, 'guang.removeHotTag', false);
let isAdDegrade = _.get(req.app.locals.pc, 'guang.removeAd', false);
const reqCtx = req.ctx(guangModel);
Promise.all([
guangModel.getBanner(channel),
reqCtx.getBanner(channel),
guangModel.getArticleList(gender, 0, uid, udid, page, query, '', pageSize, channel, true),
guangModel.getHotTags(1, 20, channel, isHotDegrade),
guangModel.getAds(channel, isAdDegrade),
guangModel.getRecoArticles(gender, 1, 10, channel),
reqCtx.getArticleList(gender, 0, uid, udid, page, query, '', pageSize, channel, true),
reqCtx.getHotTags(1, 20, channel, isHotDegrade),
reqCtx.getAds(channel, isAdDegrade),
reqCtx.getRecoArticles(gender, 1, 10, channel),
headerModel.requestHeaderData(channel)
]).then(ret => {
... ... @@ -143,17 +147,19 @@ exports.editor = (req, res, next) => {
let uid = req.user.uid;
let udid = ghelper.getUdid(req, res);
let pathNav = guangModel.getPathNav(channel);
let pathNav = req.ctx(guangModel).getPathNav(channel);
let page = req.query.page || 1;
let pageSize = req.query.pageSize || 20;
const reqCtx = req.ctx(guangModel);
Promise.all([
guangModel.getAuthor(channel, authorId),
guangModel.getArticleList(gender, null, uid, udid, page, '', authorId, pageSize, channel, true),
guangModel.getHotTags(1, 20, channel, isHotDegrade),
guangModel.getAds(channel, isAdDegrade),
guangModel.getRecoArticles(gender, 1, 10, channel),
reqCtx.getAuthor(channel, authorId),
reqCtx.getArticleList(gender, null, uid, udid, page, '', authorId, pageSize, channel, true),
reqCtx.getHotTags(1, 20, channel, isHotDegrade),
reqCtx.getAds(channel, isAdDegrade),
reqCtx.getRecoArticles(gender, 1, 10, channel),
headerModel.requestHeaderData(channel)
]).then(ret => {
... ... @@ -202,12 +208,14 @@ exports.detail = (req, res, next) => {
let isHotDegrade = _.get(req.app.locals.pc, 'guang.removeHotTag', false);
let isAdDegrade = _.get(req.app.locals.pc, 'guang.removeAd', false);
const reqCtx = req.ctx(guangModel);
if (!_.isNumber(id)) {
id = _.parseInt(id);
}
if (pjax) {
guangModel.getArticleComments(id, page, pageSize).then(ret => {
req.ctx(guangModel).getArticleComments(id, page, pageSize).then(ret => {
res.set('Cache-Control', 'no-cache');
res.render('guang/detail-comment', {
... ... @@ -226,10 +234,10 @@ exports.detail = (req, res, next) => {
// 登陆后自动收藏
if (col === 1 && uid > 0) {
guangModel.collectArticle(id, uid);
reqCtx.collectArticle(id, uid);
}
guangModel.getArticleInfo(id, channel).then(info => {
reqCtx.getArticleInfo(id, channel).then(info => {
// 判断参数是否有效, 无效会跳转到错误页面
if (!info || !info.title) {
... ... @@ -238,28 +246,28 @@ exports.detail = (req, res, next) => {
let promises = [
headerModel.requestHeaderData(channel),
guangModel.getArticleContent(id),
guangModel.getHotTags(1, 20, channel, isHotDegrade),
guangModel.getArticleComments(id, page, pageSize),
guangModel.getArticleBaseInfo(id, uid, udid),
guangModel.getArticleRelateBrand(id),
guangModel.getRecoArticles(gender, 1, 10, channel),
guangModel.getAds(channel, isAdDegrade)
reqCtx.getArticleContent(id),
reqCtx.getHotTags(1, 20, channel, isHotDegrade),
reqCtx.getArticleComments(id, page, pageSize),
reqCtx.getArticleBaseInfo(id, uid, udid),
reqCtx.getArticleRelateBrand(id),
reqCtx.getRecoArticles(gender, 1, 10, channel),
reqCtx.getAds(channel, isAdDegrade)
];
if (info.authorId) {
promises.push(guangModel.getAuthor(channel, info.authorId));
promises.push(req.ctx(guangModel).getAuthor(channel, info.authorId));
} else {
promises.push({});
}
if (info.tag) {
promises.push(guangModel.getRelateArticleList(id, info.tag, 2, channel));
promises.push(req.ctx(guangModel).getRelateArticleList(id, info.tag, 2, channel));
} else {
promises.push({});
}
let pathNav = guangModel.getPathNav(channel, info.title);
let pathNav = req.ctx(guangModel).getPathNav(channel, info.title);
Promise.all(promises).then(ret => {
... ... @@ -298,10 +306,12 @@ exports.detail = (req, res, next) => {
}
}, {
title: `${info.title} | YOHO!BUY有货 | 年轻人潮流购物中心，中国潮流购物风向标，官方授权正品保证`,
keywords: ['Yoho! 有货,潮流,时尚,流行,购物,B2C,正品,购物网站,网上购物,货到付款,品牌服饰,男士护肤,',
'黑框眼镜,匡威,板鞋,i.t,izzue,5cm,eastpak,vans,lylescott,g-shock,new balance,lacoste,melissa,',
'casio,卡西欧手表,舒雅,jasonwood,odm,AAAA,香港购物,日本潮流'].join(''),
description: '潮流商品搜索,上衣,衬衫，TEE，卫衣，冲锋衣，风衣，羽绒服，裤子,休闲鞋,板鞋,配饰，复古眼镜',
keywords: info.tag.length > 0 ? `${info.tag}` :
['Yoho! 有货,潮流,时尚,流行,购物,B2C,正品,购物网站,网上购物,货到付款,品牌服饰,男士护肤,',
'黑框眼镜,匡威,板鞋,i.t,izzue,5cm,eastpak,vans,lylescott,g-shock,new balance,lacoste,melissa,',
'casio,卡西欧手表,舒雅,jasonwood,odm,AAAA,香港购物,日本潮流'].join(''),
description: info.desc.length > 0 ? `${info.desc}` :
'潮流商品搜索,上衣,衬衫，TEE，卫衣，冲锋衣，风衣，羽绒服，裤子,休闲鞋,板鞋,配饰，复古眼镜',
webNavHeader: channel
}));
});
... ... @@ -334,7 +344,7 @@ exports.listDynamicData = (req, res) => {
other.type = type;
}
guangModel.getDynamicDataByIds(ids, udid, other).then(ret => {
req.ctx(guangModel).getDynamicDataByIds(ids, udid, other).then(ret => {
res.send(ret);
});
};
... ... @@ -349,7 +359,7 @@ exports.detailDynamicData = (req, res) => {
uid = req.user.uid,
udid = ghelper.getUdid(req, res);
guangModel.getDynamicDataById(id, uid, udid).then((ret) => {
req.ctx(guangModel).getDynamicDataById(id, uid, udid).then((ret) => {
res.status(200).send(ret);
}).catch(() => {
res.status(400);
... ... @@ -375,12 +385,12 @@ exports.comment = (req, res) => {
});
}
guangModel.addComment(id, uid, comment).then(() => {
req.ctx(guangModel).addComment(id, uid, comment).then(() => {
if (req.session['comment_' + udid]) {
req.session['comment_' + udid] = null;
}
return guangModel.getArticleComments(id, 1, 20);
return req.ctx(guangModel).getArticleComments(id, 1, 20);
}).then(commentInfo => {
res.render('guang/detail-comment', {
... ... @@ -420,7 +430,7 @@ exports.praise = (req, res) => {
// let uid = req.user.uid;
let udid = ghelper.getUdid(req, res);
guangModel.praise(id, udid).then(ret => {
req.ctx(guangModel).praise(id, udid).then(ret => {
res.send(ret);
}).catch(() => {
res.send({
... ... @@ -436,7 +446,7 @@ exports.cancelPraise = (req, res) =>{
let id = req.body.id || req.query.id;
let udid = ghelper.getUdid(req, res);
guangModel.cancelPraise(id, udid).then(ret => {
req.ctx(guangModel).cancelPraise(id, udid).then(ret => {
res.send(ret);
}).catch(() => {
res.send({
... ... @@ -458,7 +468,7 @@ exports.collect = (req, res) =>{
});
}
guangModel.collect(id, uid).then(ret => {
req.ctx(guangModel).collect(id, uid).then(ret => {
res.send(ret);
}).catch(() => {
res.send({
... ... @@ -481,7 +491,7 @@ exports.cancelCollect = (req, res) =>{
});
}
guangModel.cancelCollect(id, uid).then(ret => {
req.ctx(guangModel).cancelCollect(id, uid).then(ret => {
res.send(ret);
}).catch(() => {
res.send({
... ...
... ... @@ -11,11 +11,7 @@ const ghelper = require('./guang-helper');
const urlHelper = require('./url-helper');
const helpers = global.yoho.helpers;
const serviceApi = global.yoho.ServiceAPI;
const yohoApi = global.yoho.API;
// const KEY_WEB_GUANG_BANNER_DATA = 'key_web_guang_banner_data';// 逛的首页banner
// const KEY_WEB_GUANG_ADS_DATA = 'key_web_guang_ads_data';// 逛的首页ads
const URL_OPERATIONS_RESOURCE_GET = 'operations/api/v5/resource/get';
// guang banner code
... ... @@ -34,943 +30,1111 @@ const ADS_CODE = {
kids: '1ffdd6ea22c58af52ee6408cd353c2d5'
};
/**
* 获取首页频道nav
*/
const getHomeChannelNav = (channel) => {
let home;
switch (channel) {
case 'girls':
home = helpers.urlFormat('/woman', '', 'new');
break;
case 'lifestyle':
home = helpers.urlFormat('/lifestyle', '', 'new');
break;
case 'kids':
home = helpers.urlFormat('/kids', '', 'new');
break;
default:
home = helpers.urlFormat('', '', 'default');
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
return {
href: home,
name: `${channel.toUpperCase()}首页`,
pathTitle: 'YOHO!有货'
};
};
const getPathNav = (channelType, query) => {
/**
* 获取首页频道nav
*/
getHomeChannelNav(channel) {
let home;
let path = _.concat(
getHomeChannelNav(channelType),
[{
name: '逛',
pathTitle: '逛',
href: helpers.urlFormat('', '', 'guang')
}]
);
switch (channel) {
case 'girls':
home = helpers.urlFormat('/woman', '', 'new');
break;
case 'lifestyle':
home = helpers.urlFormat('/lifestyle', '', 'new');
break;
case 'kids':
home = helpers.urlFormat('/kids', '', 'new');
break;
default:
home = helpers.urlFormat('', '', 'default');
return query ? _.concat(path, [{ name: query, pathTitle: query}]) : path;
};
}
const _formatTag = (tagData, channel) => {
let name = tagData.name,
param = {
query: name
return {
href: home,
name: `${channel.toUpperCase()}首页`,
pathTitle: 'YOHO!有货'
};
if (channel) {
param.channel = channel;
}
return {
tag: name,
name: name,
url: helpers.urlFormat('/tags/index', param, 'guang')
};
};
getPathNav(channelType, query) {
/**
* 格式化资讯文章
*
* @param array $articleData 需要格式化的资讯数据
* @param bool $showTag 是否显示左上角标签
* @param bool $showAuthor 控制是否显示作者信息
* @return array | false
*/
const _formatArticle = (articleData, showTag, showAuthor, channel) => {
let path = _.concat(
this.getHomeChannelNav(channelType),
[{
name: '逛',
pathTitle: '逛',
href: helpers.urlFormat('', '', 'guang')
}]
);
// 资讯ID不存在，则不显示
if (!articleData || !articleData.id) {
return false;
return query ? _.concat(path, [{ name: query, pathTitle: query}]) : path;
}
let width = 360,
height = 360,
isSquareImage = true;
if (Number(articleData.conver_image_type) === 2) {
width = 360;
height = 240;
isSquareImage = false;
}
_formatTag(tagData, channel) {
let name = tagData.name,
param = {
query: name
};
let result = {
id: articleData.id,
classification: articleData.category_name,
// isReco: articleData.is_recommended && Number(articleData.is_recommended) === 1 ? true : false,
url: ghelper.getArticleUrl(articleData.url, articleData.id, channel),
img: helpers.image(articleData.src, width, height, 1),
isSquareImg: isSquareImage,
title: articleData.title,
pTime: articleData.publish_time,
pView: articleData.views_num,
content: articleData.intro,
showTags: showTag,
comment: articleData.comment_num
};
if (showTag && articleData.category_id) {
switch (String(articleData.category_id)) {
case '1': // 话题
result.isTopic = true;
break;
case '2': // 搭配
result.isCollocation = true;
break;
case '3': // 潮人
result.isFashionMan = true;
break;
case '4': // 潮品
result.isFashionGood = true;
break;
case '19': // 专题
result.isSpecialTopic = true;
break;
default:
break;
if (channel) {
param.channel = channel;
}
}
if (!articleData.author) {
articleData.author = {
name: '',
avatar: ''
return {
tag: name,
name: name,
url: helpers.urlFormat('/tags/index', param, 'guang')
};
}
result.author = articleData.author.name;
/**
* 格式化资讯文章
*
* @param array $articleData 需要格式化的资讯数据
* @param bool $showTag 是否显示左上角标签
* @param bool $showAuthor 控制是否显示作者信息
* @return array | false
*/
_formatArticle(articleData, showTag, showAuthor, channel) {
// 资讯ID不存在，则不显示
if (!articleData || !articleData.id) {
return false;
}
let authorId = articleData.author.author_id;
let width = 360,
height = 360,
isSquareImage = true;
if (authorId) {
result.editorUrl = urlHelper.editorUrl(channel, authorId);
}
let tags = [];
if (Number(articleData.conver_image_type) === 2) {
width = 360;
height = 240;
isSquareImage = false;
}
if (articleData.tags) {
let aTags = articleData.tags;
let result = {
id: articleData.id,
classification: articleData.category_name,
// isReco: articleData.is_recommended && Number(articleData.is_recommended) === 1 ? true : false,
url: ghelper.getArticleUrl(articleData.url, articleData.id, channel),
img: helpers.image(articleData.src, width, height, 1),
isSquareImg: isSquareImage,
title: articleData.title,
pTime: articleData.publish_time,
pView: articleData.views_num,
content: articleData.intro,
showTags: showTag,
comment: articleData.comment_num
};
for (let i = 0; i < aTags.length; i++) {
tags.push(_formatTag(aTags[i], channel));
if (showTag && articleData.category_id) {
switch (String(articleData.category_id)) {
case '1': // 话题
result.isTopic = true;
break;
case '2': // 搭配
result.isCollocation = true;
break;
case '3': // 潮人
result.isFashionMan = true;
break;
case '4': // 潮品
result.isFashionGood = true;
break;
case '19': // 专题
result.isSpecialTopic = true;
break;
default:
break;
}
}
}
result.tags = tags;
_.assign(result, {
tags: tags,
like: articleData.praise_num,
liked: articleData.isPraise === 'Y'
});
if (!articleData.author) {
articleData.author = {
name: '',
avatar: ''
};
}
// 判断是否显示作者信息
if (showAuthor && articleData.author) {
result.author = _.cloneDeep(articleData.author);
}
result.author = articleData.author.name;
// 模板中需要的标签标识
if (showTag && articleData.category_id) {
let categoryId = '' + articleData.category_id;
let authorId = articleData.author.author_id;
switch (categoryId) {
case '1': // 话题
result.isTopic = true;
break;
case '2': // 搭配
result.isCollocation = true;
break;
case '3': // 潮人
result.isFashionMan = true;
break;
case '4': // 潮品
result.isFashionGood = true;
break;
case '5': // 小贴士
result.isTip = true;
break;
default:
result.isTopic = true;
if (authorId) {
result.editorUrl = urlHelper.editorUrl(channel, authorId);
}
}
return result;
};
const _formatAd = (adData, channel) => {
let tags = [];
if (!adData) {
return null;
}
if (articleData.tags) {
let aTags = articleData.tags;
let param = {
id: adData.id
};
for (let i = 0; i < aTags.length; i++) {
tags.push(this._formatTag(aTags[i], channel));
}
}
if (channel) {
param.channel = channel;
}
result.tags = tags;
return {
img: helpers.image(adData.src, 640, 640),
url: helpers.urlFormat('/info/index', param, 'guang'),
title: adData.title,
bgColor: adData.bgColor
};
};
_.assign(result, {
tags: tags,
like: articleData.praise_num,
liked: articleData.isPraise === 'Y'
});
/**
* 获取页文章数据
* @param {String} channelType 传入频道页类型，值可以是: boys, girls, kids, lifestyle
* @return {Object}
*/
const getArticleList = (gender, sortId, uid, udid, page, tag, authorId, limit, channel, useCache) => {
uid = uid || 0;
udid = udid || '';
page = page || 1;
useCache = useCache || false;
let param = {
gender: gender,
page: page,
uid: uid,
udid: udid,
client_type: 'web'
};
if (sortId) {
param.sort_id = sortId;
}
// 判断是否显示作者信息
if (showAuthor && articleData.author) {
result.author = _.cloneDeep(articleData.author);
}
if (tag) {
param.tag = tag;
// 模板中需要的标签标识
if (showTag && articleData.category_id) {
let categoryId = '' + articleData.category_id;
switch (categoryId) {
case '1': // 话题
result.isTopic = true;
break;
case '2': // 搭配
result.isCollocation = true;
break;
case '3': // 潮人
result.isFashionMan = true;
break;
case '4': // 潮品
result.isFashionGood = true;
break;
case '5': // 小贴士
result.isTip = true;
break;
default:
result.isTopic = true;
}
}
return result;
}
if (authorId && Number(authorId)) {
param.author_id = authorId;
}
_formatAd(adData, channel) {
if (limit) {
param.limit = limit;
}
if (!adData) {
return null;
}
return serviceApi.get('guang/api/v2/article/getList', param, {
cache: useCache ? 300 : false
}).then(res => {
let param = {
id: adData.id
};
if (res && res.data) {
if (channel) {
param.channel = channel;
}
let artList,
adsList,
total = 0;
return {
img: helpers.image(adData.src, 640, 640),
url: helpers.urlFormat('/info/index', param, 'guang'),
title: adData.title,
bgColor: adData.bgColor
};
}
if (res.data.total) {
total = _.parseInt(res.data.total);
}
/**
* 获取页文章数据
* @param {String} channelType 传入频道页类型，值可以是: boys, girls, kids, lifestyle
* @return {Object}
*/
getArticleList(gender, sortId, uid, udid, page, tag, authorId, limit, channel, useCache) {
if (res.data.list) {
let list = res.data.list;
uid = uid || 0;
udid = udid || '';
page = page || 1;
useCache = useCache || false;
if (list.artList) {
artList = _.map(list.artList, it => _formatArticle(it, true, false, channel));
}
let param = {
gender: gender,
page: page,
uid: uid,
udid: udid,
client_type: 'web'
};
if (list.adlist) {
adsList = _.map(list.artList, it => _formatAd(it, channel));
}
}
if (sortId) {
param.sort_id = sortId;
}
return {
msgs: artList,
ads: adsList,
total: total
};
if (tag) {
param.tag = tag;
}
return null;
});
};
/**
* 获取热门标签数据
* @param {String} type 传入频道页类型，值可以是: boys, girls, kids, lifestyle
* @return {Object}
*/
const getHotTags = (page, limit, channel, isDegrade) => {
if (authorId && Number(authorId)) {
param.author_id = authorId;
}
let data = {
client_type: 'web',
page: page || 1,
limit: limit || 10
};
if (limit) {
param.limit = limit;
}
if (isDegrade) {
return null;
}
return this.get({
url: 'guang/api/v2/article/getList',
data: param,
param: {
cache: useCache ? 300 : false
},
api: global.yoho.ServiceAPI
return serviceApi.get('guang/api/v2/article/getTagTop', data, {
cache: true
}).then(res => {
return _.map((res && res.data) || [], it => {
let param = {
query: it.tag_name
};
}).then(res => {
if (channel) {
param.channel = channel;
}
if (res && res.data) {
return {
tagName: it.tag_name,
url: helpers.urlFormat('/tags/index', param, 'guang')
};
});
});
};
let artList,
adsList,
total = 0;
/**
* 获取广告数据
* @param {String} channelType 传入频道页类型，值可以是: boys, girls, kids, lifestyle
* @return {Object}
*/
const getAds = (channelType, isDegrade) => {
if (res.data.total) {
total = _.parseInt(res.data.total);
}
let contentCode = ADS_CODE[channelType] || ADS_CODE.boys;
if (res.data.list) {
let list = res.data.list;
if (isDegrade) {
return null;
}
if (list.artList) {
artList = _.map(list.artList, it => this._formatArticle(it, true, false, channel));
}
return serviceApi.get(URL_OPERATIONS_RESOURCE_GET, {
content_code: contentCode
}, {cache: true}).then(res => {
let list = [];
if (list.adlist) {
adsList = _.map(list.artList, it => this._formatAd(it, channel));
}
}
if (res && res.code === 200 && res.data && res.data[0] && res.data[0].data) {
list = _.map(res.data[0].data, (it) => {
return {
img: helpers.image(it.src, 640, 640, 1),
url: it.url
msgs: artList,
ads: adsList,
total: total
};
});
}
return list.length > 5 ? list.slice(0, 4) : list;
});
};
}
return null;
});
}
/**
* 获取热门标签数据
* @param {String} type 传入频道页类型，值可以是: boys, girls, kids, lifestyle
* @return {Object}
*/
const getBanner = channelType => {
/**
* 获取热门标签数据
* @param {String} type 传入频道页类型，值可以是: boys, girls, kids, lifestyle
* @return {Object}
*/
getHotTags(page, limit, channel, isDegrade) {
let data = {
client_type: 'web',
page: page || 1,
limit: limit || 10
};
let contentCode = BANNER_CODE[channelType] || BANNER_CODE.boys;
if (isDegrade) {
return null;
}
return serviceApi.get(URL_OPERATIONS_RESOURCE_GET, {
content_code: contentCode
}, {cache: true}).then(res => {
return this.get({
url: 'guang/api/v2/article/getTagTop',
data: data,
param: {
cache: true
},
api: global.yoho.ServiceAPI
let list = [];
}).then(res => {
return _.map((res && res.data) || [], it => {
let param = {
query: it.tag_name
};
if (res && res.code === 200 && res.data && res.data[0] && res.data[0].data) {
if (channel) {
param.channel = channel;
}
list = _.map(res.data[0].data, it => {
return {
img: helpers.image(it.src, 830, 327, 1),
url: it.url
tagName: it.tag_name,
url: helpers.urlFormat('/tags/index', param, 'guang')
};
});
}
return list;
});
};
});
}
const getCategory = (currentSortId, channel) => {
/**
* 获取广告数据
* @param {String} channelType 传入频道页类型，值可以是: boys, girls, kids, lifestyle
* @return {Object}
*/
getAds(channelType, isDegrade) {
currentSortId = currentSortId || 0;
return serviceApi.get('guang/api/v1/category/get', {}, {
cache: true
}).then(res => {
let list = [];
let contentCode = ADS_CODE[channelType] || ADS_CODE.boys;
if (res && res.code === 200 && res.data) {
for (let cat of res.data) {
let param = {
type: cat.id
};
if (isDegrade) {
return null;
}
if (channel) {
param.channel = channel;
}
let data = {
content_code: contentCode
};
list.push({
typeId: cat.id,
type: cat.name,
isActive: String(cat.id) === String(currentSortId),
navUrl: urlHelper.listUrl(channel, cat.id)
return this.get({
url: URL_OPERATIONS_RESOURCE_GET,
data: data,
param: {
cache: true
},
api: global.yoho.ServiceAPI
}).then(res => {
let list = [];
if (res && res.code === 200 && res.data && res.data[0] && res.data[0].data) {
list = _.map(res.data[0].data, (it) => {
return {
img: helpers.image(it.src, 640, 640, 1),
url: it.url
};
});
}
}
return list;
});
};
return list.length > 5 ? list.slice(0, 4) : list;
});
}
/**
* 推荐文章
*/
const getRecoArticles = (gender, page, limit, channel) => {
/**
* 获取热门标签数据
* @param {String} type 传入频道页类型，值可以是: boys, girls, kids, lifestyle
* @return {Object}
*/
getBanner(channelType) {
return serviceApi.get('guang/api/v2/article/getArticleByViewsNum', {
gender: gender,
page: page,
limit: limit
}, {cache: true}).then(res => {
let contentCode = BANNER_CODE[channelType] || BANNER_CODE.boys;
let list = [];
let data = {
content_code: contentCode
};
if (res && res.data) {
for (let i = 0; i < res.data.length; i++) {
let it = res.data[i];
return this.get({
url: URL_OPERATIONS_RESOURCE_GET,
data: data,
param: {
cache: true
},
api: global.yoho.ServiceAPI
let reco = {
url: ghelper.getArticleUrl(it.url, it.id, channel),
title: it.title
};
}).then(res => {
if (it.src) {
reco.img = helpers.image(it.src, 90, 60, 1);
}
let list = [];
list.push(reco);
if (res && res.code === 200 && res.data && res.data[0] && res.data[0].data) {
list = _.map(res.data[0].data, it => {
return {
img: helpers.image(it.src, 830, 327, 1),
url: it.url
};
});
}
}
return list;
});
}
return list;
});
};
getCategory(currentSortId, channel) {
/**
* 获取作者信息
*/
const getAuthor = (channel, authorId) => {
currentSortId = currentSortId || 0;
return serviceApi.get('guang/service/v1/author/getAuthor', {
author_id: authorId
}, {
cache: 3600
}).then(res => {
if (res && res.data) {
let d = res.data;
return this.get({
url: 'guang/api/v1/category/get',
param: {
cache: true
},
api: global.yoho.ServiceAPI
return {
authorId: authorId,
avatar: d.avatar,
name: d.name,
intro: d.author_desc,
authorUrl: d.name ? urlHelper.editorUrl(channel, authorId) : ''
};
}
});
};
}).then(res => {
let list = [];
/**
* 获取文章基本信息，文章标题（不含内容）
*/
const getArticleInfo = (aid, channel) => {
return serviceApi.get('guang/service/v2/article/getArticle', {
article_id: aid
}, {cache: true}).then(res => {
if (res && res.code === 200 && res.data) {
let d = res.data;
let tags = [];
if (d.tags) {
for (let i = 0; i < d.tags.length; i++) {
tags.push(_formatTag(d.tags[i], channel));
if (res && res.code === 200 && res.data) {
for (let cat of res.data) {
let param = {
type: cat.id
};
if (channel) {
param.channel = channel;
}
list.push({
typeId: cat.id,
type: cat.name,
isActive: String(cat.id) === String(currentSortId),
navUrl: urlHelper.listUrl(channel, cat.id)
});
}
}
return {
title: d.article_title,
time: moment(d.publish_time * 1000).format('YYYY年MM月DD HH:mm'),
click: d.pageViews,
shareImg: helpers.image(d.cover_image, 600, 600),
desc: d.article_summary,
authorId: d.author_id,
weixinUrl: d.url,
tag: d.tag, // tags 的字符串
tags: tags
};
}
});
};
const _formatProduct = (products, arr) => {
let result = [];
return list;
});
}
_.forEach(products, val => {
/**
* 推荐文章
*/
getRecoArticles(gender, page, limit, channel) {
let goods = {
thumb: helpers.image(val.default_images, 235, 314),
product_name: val.product_name,
sales_price: val.sales_price,
url: helpers.getUrlBySkc(val.product_id, val.goods_list[0].goods_id, val.cn_alphabet)
let data = {
gender: gender,
page: page,
limit: limit
};
if (val.market_price !== val.sales_price) {
goods.marketPrice = val.market_price;
}
return this.get({
url: 'guang/api/v2/article/getArticleByViewsNum',
data: data,
param: {
cache: true
},
api: global.yoho.ServiceAPI
_.forEach(arr, (v, k) => {
if (Number(k) === Number(val.product_skn)) {
goods.thumb = helpers.image(v, 235, 314);
}
});
}).then(res => {
result.push(goods);
});
let list = [];
return result;
};
if (res && res.data) {
for (let i = 0; i < res.data.length; i++) {
let it = res.data[i];
/**
* 按照skn string 来查询 query=skn1,skn2,skn3
*/
const getProductList = (params, arr) => {
return yohoApi.get('', _.assign({
method: 'web.search.search',
order: 's_n_desc',
limit: 60
}, params), { cache: true }).then(ret => {
if (ret && ret.code === 200 && ret.data && ret.data.product_list) {
return _formatProduct(ret.data.product_list, arr);
}
});
};
let reco = {
url: ghelper.getArticleUrl(it.url, it.id, channel),
title: it.title
};
const _articleContentFormat = {
goods: goods => {
if (it.src) {
reco.img = helpers.image(it.src, 90, 60, 1);
}
let productSkn = [],
arr = {};
list.push(reco);
}
}
_.forEach(goods, val => {
productSkn.push(val.id);
arr[val.id] = val.src;
return list;
});
}
if (productSkn.length > 0) {
/**
* 获取作者信息
*/
getAuthor(channel, authorId) {
return getProductList({
query: productSkn.join(',')
}, arr);
let data = {
author_id: authorId
};
}
return this.get({
url: 'guang/service/v1/author/getAuthor',
data: data,
param: {
cache: 3600
},
api: global.yoho.ServiceAPI
return null;
},
goodsGroup: goodsGroup => {
}).then(res => {
if (res && res.data) {
let d = res.data;
let result = [];
return {
authorId: authorId,
avatar: d.avatar,
name: d.name,
intro: d.author_desc,
authorUrl: d.name ? urlHelper.editorUrl(channel, authorId) : ''
};
}
});
}
_.forEach(goodsGroup, val => {
if (val && val.list) {
/**
* 获取文章基本信息，文章标题（不含内容）
*/
getArticleInfo(aid, channel) {
let productSkn = [];
let arr = {};
let data = {
article_id: aid
};
for (let it of val.list) {
productSkn.push(it.id);
arr[it.id] = it.src;
return this.get({
url: 'guang/service/v2/article/getArticle',
data: data,
param: {
cache: true
},
api: global.yoho.ServiceAPI
}).then(res => {
if (res && res.code === 200 && res.data) {
let d = res.data;
let tags = [];
if (d.tags) {
for (let i = 0; i < d.tags.length; i++) {
tags.push(this._formatTag(d.tags[i], channel));
}
}
if (productSkn.length) {
// 包含多个对象，每对象里list都取数据，最终每个list只取前4个
result.push(getProductList({
query: productSkn.join(',')
}, arr).then(products => {
return {
title: d.article_title,
time: moment(d.publish_time * 1000).format('YYYY年MM月DD HH:mm'),
click: d.pageViews,
shareImg: helpers.image(d.cover_image, 600, 600),
desc: d.article_summary,
authorId: d.author_id,
weixinUrl: d.url,
tag: d.tag, // tags 的字符串
tags: tags
};
}
});
}
let pl = [];
_formatProduct(products, arr) {
let result = [];
if (products && _.isArray(products)) {
pl = products.slice(0, 4);
}
_.forEach(products, val => {
return pl;
}));
}
let goods = {
thumb: helpers.image(val.default_images, 235, 314),
product_name: val.product_name,
sales_price: val.sales_price,
url: helpers.getUrlBySkc(val.product_id, val.goods_list[0].goods_id, val.cn_alphabet)
};
if (val.market_price !== val.sales_price) {
goods.marketPrice = val.market_price;
}
_.forEach(arr, (v, k) => {
if (Number(k) === Number(val.product_skn)) {
goods.thumb = helpers.image(v, 235, 314);
}
});
result.push(goods);
});
return result;
},
text: data => {
return data;
},
singleImage: data => {
if (data && data[0] && data[0].src) {
return {
pic: helpers.image(data[0].src, 640, 640)
};
}
return null;
},
smallPic: data => {
let result = {
smallPic: []
}
/**
* 按照skn string 来查询 query=skn1,skn2,skn3
*/
getProductList(params, arr) {
let data = {
method: 'web.search.search',
order: 's_n_desc',
limit: 60
};
_.forEach(data, (it, key) => {
if (key < 2) {
result.smallPic.push(helpers.image(it.src, 600, 600));
Object.assign(data, params);
return this.get({
data: data,
param: {
cache: true
}
}).then(ret => {
if (ret && ret.code === 200 && ret.data && ret.data.product_list) {
return this._formatProduct(ret.data.product_list, arr);
}
});
return result;
},
link: () => ({})
};
}
/**
* 获取文章内容详情
*/
const getArticleContent = aid => {
let content = [],
index = 0;
_articleContentFormat() {
return {
goods: goods=> {
let productSkn = [],
arr = {};
_.forEach(goods, val => {
productSkn.push(val.id);
arr[val.id] = val.src;
});
if (productSkn.length > 0) {
return serviceApi.get('guang/service/v2/article/getArticleContent', {
article_id: aid
}, {cache: true}).then(res => { // 内容内推荐的商品
return this.getProductList({
query: productSkn.join(',')
}, arr);
}
let gpromises = [], ggpromises = [];
return null;
},
goodsGroup: goodsGroup=>{
let result = [];
_.forEach(goodsGroup, val => {
if (val && val.list) {
let productSkn = [];
let arr = {};
for (let it of val.list) {
productSkn.push(it.id);
arr[it.id] = it.src;
}
if (res && res.code === 200 && res.data) {
_.forEach(res.data, (it) => {
if (productSkn.length) {
// 包含多个对象，每对象里list都取数据，最终每个list只取前4个
result.push(this.getProductList({
query: productSkn.join(',')
}, arr).then(products => {
_.forEach(it, (val, key) => {
if (key === 'goods') {
gpromises.push(_articleContentFormat.goods(val.data));
} else if (key === 'goodsGroup') {
// 可能包含多个list，则有多个promise
ggpromises = ggpromises.concat(_articleContentFormat.goodsGroup(val.data));
} else {
let other = _.isFunction(_articleContentFormat[key]) ?
_articleContentFormat[key](val.data) : '';
let pl = [];
content.push(other);
if (products && _.isArray(products)) {
pl = products.slice(0, 4);
}
return pl;
}));
}
}
});
});
}
index = gpromises.length;
return Promise.all(gpromises.concat(ggpromises));
return result;
},
text: data => {
return data;
},
singleImage: data => {
if (data && data[0] && data[0].src) {
return {
pic: helpers.image(data[0].src, 640, 640)
};
}
return null;
},
smallPic: data => {
let result = {
smallPic: []
};
}).then(res => {
_.forEach(data, (it, key) => {
if (key < 2) {
result.smallPic.push(helpers.image(it.src, 600, 600));
}
});
return result;
},
link: () => ({})
};
}
let goods = _.filter(_.flatten(res.slice(0, index)), function(it) {
return it;
});
let goodsGroup = _.filter(_.flatten(res.slice(index)), function(it) {
return it;
});
/**
* 获取文章内容详情
*/
getArticleContent(aid) {
let that = this;
if (goods.length > 0) {
content.push({
relatedReco: {
recos: goods
}
});
}
let content = [],
index = 0;
if (goodsGroup.length > 0) {
content.push({
relatedReco: {
recos: goodsGroup
}
});
}
let data = {
article_id: aid
};
return content;
});
};
return this.get({
url: 'guang/service/v2/article/getArticleContent',
data: data,
param: {
cache: true
},
api: global.yoho.ServiceAPI
}).then(res => { // 内容内推荐的商品
let gpromises = [], ggpromises = [];
if (res && res.code === 200 && res.data) {
_.forEach(res.data, (it) => {
_.forEach(it, (val, key) => {
if (key === 'goods') {
gpromises.push(that._articleContentFormat().goods(val.data));
return;
} else if (key === 'goodsGroup') {
// 可能包含多个list，则有多个promise
ggpromises = ggpromises.concat(that._articleContentFormat().goodsGroup(val.data));
} else {
let other = _.isFunction(that._articleContentFormat()[key]) ?
that._articleContentFormat()[key](val.data) : '';
content.push(other);
}
});
});
}
/**
* 判断用户是否收藏文章地址,应该是文章与用户关联的信息
* @param $articleId
* @param $uid
* @param $udid
* @param bool $onlyUrl
* @return mixed
*/
const getArticleBaseInfo = (aid, uid, udid) => {
return serviceApi.get('guang/api/v1/article/getArticleBaseInfo', {
id: aid,
uid: uid,
udid: udid
}).then(res => ({
isLike: res && res.isPraise === 'Y',
likeNum: res.praise_num || 0,
isCollected: res && res.isFavor === 'Y'
}));
};
index = gpromises.length;
return Promise.all(gpromises.concat(ggpromises));
/**
* 文章相关品牌
* @param $articleId
* @param bool $onlyUrl
* @return mixed
*/
const getArticleRelateBrand = aid => {
return serviceApi.get('guang/service/v2/article/getBrand', {
article_id: aid
}, {cache: true}).then(res => {
if (res && res.code === 200 && res.data) {
return _.map(res.data, it => {
it.thumb = it.thumb;
it.url = it.url;
}).then(res => {
let goods = _.filter(_.flatten(res.slice(0, index)), function(it) {
return it;
});
}
});
};
/**
* 相关文章列表
* @param $articleId
* @param $tag
* @param int $limit
* @param bool $onlyUrl
* @return mixed
*/
const getRelateArticleList = (aid, tag, size, channel) => {
size = size || 3;
return serviceApi.get('guang/service/v2/article/getOtherArticle', {
article_id: aid,
tags: tag,
limit: size
}, {cache: true}).then(res => {
if (res && res.code === 200 && res.data) {
return _.map(res.data, it => {
it.thumb = helpers.image(it.thumb, 264, 173, 1);
it.url = ghelper.getArticleUrl(it.url, it.id, channel);
let goodsGroup = _.filter(_.flatten(res.slice(index)), function(it) {
return it;
});
}
});
};
/**
* 获取文章评论数据
*/
const getArticleComments = (aid, page, pageSize) => {
page = page || 1;
pageSize = pageSize || 20;
return serviceApi.get('guang/api/v1/comments/getList', {
article_id: aid,
page: page,
limit: pageSize
}).then(res => {
let num = (res.data && res.data.total) || 0;
let list = [];
if (num > 0 && res.data.list) {
let iList = res.data.list;
for (let i = 0; i < iList.length; i++) {
let it = iList[i];
list.push({
avatar: helpers.image(it.avator, 100, 100),
name: it.username,
content: it.content,
time: it.create_time
if (goods.length > 0) {
content.push({
relatedReco: {
recos: goods
}
});
}
}
return {
commentNum: num,
pageSize: pageSize,
if (goodsGroup.length > 0) {
content.push({
relatedReco: {
recos: goodsGroup
}
});
}
return content;
});
}
/**
* 判断用户是否收藏文章地址,应该是文章与用户关联的信息
* @param $articleId
* @param $uid
* @param $udid
* @param bool $onlyUrl
* @return mixed
*/
getArticleBaseInfo(aid, uid, udid) {
let data = {
id: aid,
uid: uid,
udid: udid
};
return this.get({
url: 'guang/api/v1/article/getArticleBaseInfo',
data: data,
api: global.yoho.ServiceAPI
}).then(res => ({
isLike: res && res.isPraise === 'Y',
likeNum: res.praise_num || 0,
isCollected: res && res.isFavor === 'Y'
}));
}
/**
* 文章相关品牌
* @param $articleId
* @param bool $onlyUrl
* @return mixed
*/
getArticleRelateBrand(aid) {
let data = {
article_id: aid
};
return this.get({
url: 'guang/service/v2/article/getBrand',
data: data,
param: {
cache: true
},
api: global.yoho.ServiceAPI
}).then(res => {
if (res && res.code === 200 && res.data) {
return _.map(res.data, it => {
it.thumb = it.thumb;
it.url = it.url;
return it;
});
}
});
}
/**
* 相关文章列表
* @param $articleId
* @param $tag
* @param int $limit
* @param bool $onlyUrl
* @return mixed
*/
getRelateArticleList(aid, tag, size, channel) {
size = size || 3;
let data = {
article_id: aid,
tags: tag,
limit: size
};
return this.get({
url: 'guang/service/v2/article/getOtherArticle',
data: data,
param: {
cache: true
},
api: global.yoho.ServiceAPI
}).then(res => {
if (res && res.code === 200 && res.data) {
return _.map(res.data, it => {
it.thumb = helpers.image(it.thumb, 264, 173, 1);
it.url = ghelper.getArticleUrl(it.url, it.id, channel);
return it;
});
}
});
}
/**
* 获取文章评论数据
*/
getArticleComments(aid, page, pageSize) {
page = page || 1;
pageSize = pageSize || 20;
let data = {
article_id: aid,
page: page,
list: list,
baseUrl: helpers.urlFormat('/info/index', {
id: aid,
pageSize: pageSize
}, 'guang')
limit: pageSize
};
});
};
/**
* 文章评论提交
* @param $id
* @param $uid
* @return mixed
*/
const addComment = (aid, uid, content) => serviceApi.get('guang/api/v1/comments/add', {
article_id: aid,
uid: uid,
content: content
}).then(res => {
if (res && res.code === 200) {
return res.data;
} else {
return Promise.reject('评论失败');
return this.get({
url: 'guang/api/v1/comments/getList',
data: data,
api: global.yoho.ServiceAPI
}).then(res => {
let num = (res.data && res.data.total) || 0;
let list = [];
if (num > 0 && res.data.list) {
let iList = res.data.list;
for (let i = 0; i < iList.length; i++) {
let it = iList[i];
list.push({
avatar: helpers.image(it.avator, 100, 100),
name: it.username,
content: it.content,
time: it.create_time
});
}
}
return {
commentNum: num,
pageSize: pageSize,
page: page,
list: list,
baseUrl: helpers.urlFormat('/info/index', {
id: aid,
pageSize: pageSize
}, 'guang')
};
});
}
});
/**
* 文章点赞
* @param $id
* @param $uid
* @return mixed
*/
const praise = (aid, udid) => serviceApi.get('guang/api/v2/praise/setPraise', {
article_id: aid,
udid: udid
});
/**
* 文章评论提交
* @param $id
* @param $uid
* @return mixed
*/
addComment(aid, uid, content) {
let data = {
article_id: aid,
uid: uid,
content: content
};
/**
* 文章点赞
* @param $id
* @param $uid
* @return mixed
*/
const cancelPraise = (aid, udid) => serviceApi.get('guang/api/v2/praise/cancel', {
article_id: aid,
udid: udid
});
return this.get({
url: 'guang/api/v1/comments/add',
data: data,
api: global.yoho.ServiceAPI
/**
* 收藏文章
* @param $id
* @param $uid
* @return mixed
*/
const collect = (aid, uid) => serviceApi.get('guang/api/v1/favorite/setFavorite', {
article_id: aid,
uid: uid
});
}).then(res => {
if (res && res.code === 200) {
return res.data;
} else {
return Promise.reject('评论失败');
}
});
}
/**
* 取消收藏文章
* @param $id
* @param $uid
* @return mixed
*/
const cancelCollect = (aid, uid) => serviceApi.get('guang/api/v1/favorite/cancelFavorite', {
article_id: aid,
uid: uid
});
/**
* 文章点赞
* @param $id
* @param $uid
* @return mixed
*/
praise(aid, udid) {
let data = {
article_id: aid,
udid: udid
};
/**
* 获取制指定文章的动态信息
* @param ids
* @returns {Promise.<T>|*}
*/
const getDynamicDataById = (id, uid, udid) => {
return serviceApi.get('guang/api/*/article/getArticlePraiseAndFavor', {
id: id,
uid: uid,
udid: udid
});
};
return this.get({
url: 'guang/api/v2/praise/setPraise',
data: data,
api: global.yoho.ServiceAPI
});
}
/**
* 获取制指定文章的动态信息
* @param ids
* @param udid
* @param other [Obejct] 包含uid,query,type等非必传参数
* @returns {Promise.<T>|*}
*/
const getDynamicDataByIds = (ids, udid, other) => {
let params = {
articleIds: ids,
udid: udid
};
if (other.uid) {
_.assign(params, {
uid: other.uid
/**
* 文章点赞
* @param $id
* @param $uid
* @return mixed
*/
cancelPraise(aid, udid) {
let data = {
article_id: aid,
udid: udid
};
return this.get({
url: 'guang/api/v2/praise/cancel',
data: data,
api: global.yoho.ServiceAPI
});
}
/**
* 收藏文章
* @param $id
* @param $uid
* @return mixed
*/
collect(aid, uid) {
let data = {
article_id: aid,
uid: uid
};
return this.get({
url: 'guang/api/v1/favorite/setFavorite',
data: data,
api: global.yoho.ServiceAPI
});
}
if (other.query) {
_.assign(params, {
query: other.query
/**
* 取消收藏文章
* @param $id
* @param $uid
* @return mixed
*/
cancelCollect(aid, uid) {
let data = {
article_id: aid,
uid: uid
};
return this.get({
url: 'guang/api/v1/favorite/cancelFavorite',
data: data,
api: global.yoho.ServiceAPI
});
}
if (other.type) {
_.assign(params, {
type: other.type
/**
* 获取制指定文章的动态信息
* @param ids
* @returns {Promise.<T>|*}
*/
getDynamicDataById(id, uid, udid) {
let data = {
id: id,
uid: uid,
udid: udid
};
return this.get({
url: 'guang/api/*/article/getArticlePraiseAndFavor',
data: data,
api: global.yoho.ServiceAPI
});
}
return serviceApi.get('guang/api/*/article/getSimpleArticleList', params);
};
/**
* 获取制指定文章的动态信息
* @param ids
* @param udid
* @param other [Obejct] 包含uid,query,type等非必传参数
* @returns {Promise.<T>|*}
*/
getDynamicDataByIds(ids, udid, other) {
let params = {
articleIds: ids,
udid: udid
};
if (other.uid) {
_.assign(params, {
uid: other.uid
});
}
if (other.query) {
_.assign(params, {
query: other.query
});
}
if (other.type) {
_.assign(params, {
type: other.type
});
}
return this.get({
url: 'guang/api/*/article/getSimpleArticleList',
data: params,
api: global.yoho.ServiceAPI
});
}
module.exports = {
getArticleList,
getHotTags,
getAds,
getBanner,
getCategory,
getRecoArticles,
getPathNav,
getAuthor,
getArticleInfo,
getArticleContent,
getArticleBaseInfo,
getArticleRelateBrand,
getRelateArticleList,
getArticleComments,
addComment,
praise,
cancelPraise,
collect,
cancelCollect,
getDynamicDataById,
getDynamicDataByIds
};
... ...
... ... @@ -2,21 +2,6 @@
{{# guang}}
{{> common/path-nav}}
<div class="left-side">
<div id="slider" class="slider">
<ul class="slide-wrapper">
{{#each slider}}
<li>
<a href="{{url}}" target="_blank">
{{#if @first}}
<img src="{{image2 img}}">
{{^}}
<img class="lazy" data-original="{{image2 img}}">
{{/if}}
</a>
</li>
{{/each}}
</ul>
</div>
<div id="pjax-container" class="msg">
<ul class="msg-nav">
{{# msgTypes}}
... ...
... ... @@ -5,14 +5,14 @@
*/
'use strict';
const helpModel = require('../models/help');
const helpModel = require('../models/help-service');
const _ = require('lodash');
const index = (req, res, next) => {
exports.index = (req, res, next) => {
let siteUrl = global.yoho.config.siteUrl;
let channel = req.query.channel ? req.query.channel : 'boys';
helpModel.helpData(channel).then(result => {
req.ctx(helpModel).helpData(channel).then(result => {
if (result.content.menuData.length === 0) {
return next();
}
... ... @@ -40,7 +40,7 @@ const index = (req, res, next) => {
/**
* 详情
*/
const detail = (req, res, next) => {
exports.detail = (req, res, next) => {
let q = req.query;
let params = {
id: parseInt(q.id || 1, 10),
... ... @@ -62,7 +62,7 @@ const detail = (req, res, next) => {
}
];
helpModel.detailData(params).then(result => {
req.ctx(helpModel).detailData(params).then(result => {
let newData = result.newData;
let headerData = result.headerData;
... ... @@ -90,22 +90,15 @@ const detail = (req, res, next) => {
};
// 帮助搜索功能
const search = (req, res, next) => {
helpModel.searchData(req.query).then(result => {
exports.search = (req, res, next) => {
req.ctx(helpModel).searchData(req.query).then(result => {
res.json(result);
}).catch(next);
};
// 获取在线客服的链接
const onlineService = (req, res, next) => {
helpModel.onlineService().then(url => {
exports.onlineService = (req, res, next) => {
req.ctx(helpModel).onlineService().then(url => {
res.json(url);
}).catch(next);
};
module.exports = {
index,
detail,
search,
onlineService
};
... ...
... ... @@ -6,75 +6,104 @@
'use strict';
const api = global.yoho.API;
// 获取热词搜索
const getHotSearch = () => {
return api.get('', {
method: 'app.helper.hotSearch',
showPlatform: 'yohobuy_pc'
}, {
code: 200,
cache: true
});
};
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
// 获取首页帮助分类以及常见问题
const gethomeCategoryFaq = () => {
return api.get('', {
method: 'app.helper.homeCategoryFaq',
showPlatform: 'yohobuy_pc'
}, {
code: 200,
cache: true
});
};
// 获取热词搜索
getHotSearch() {
// 获取自助服务
const getSelfService = () => {
return api.get('', {
method: 'app.helper.selfService',
showPlatform: 'yohobuy_pc'
}, {
code: 200
});
};
let data = {
method: 'app.helper.hotSearch',
showPlatform: 'yohobuy_pc'
};
const helpSearch = (params) => {
return api.get('', {
method: 'app.helper.search',
showPlatform: 'yohobuy_pc',
keyword: params.keywords,
page: params.page,
viewNum: '15',
debug: 'XYZ'
}, {
code: 200
});
};
return this.get({
data: data,
param: {
code: 200,
cache: true
}
});
}
const allQA = (page) => {
return api.get('', {
method: 'app.helper.allQA',
showPlatform: 'yohobuy_pc',
viewNum: 15,
page: page
}, {
code: 200
});
};
// 获取首页帮助分类以及常见问题
gethomeCategoryFaq() {
const onlineService = () => {
return api.get('', {
method: 'app.helper.getServiceOnline'
});
};
let data = {
method: 'app.helper.homeCategoryFaq',
showPlatform: 'yohobuy_pc'
};
return this.get({
data: data,
param: {
code: 200,
cache: true
}
});
}
// 获取自助服务
getSelfService() {
let data = {
method: 'app.helper.selfService',
showPlatform: 'yohobuy_pc'
};
module.exports = {
getHotSearch,
gethomeCategoryFaq,
getSelfService,
helpSearch,
allQA,
onlineService
return this.get({
data: data,
param: {
code: 200
}
});
}
helpSearch(params) {
let data = {
method: 'app.helper.search',
showPlatform: 'yohobuy_pc',
keyword: params.keywords,
page: params.page,
viewNum: '15',
debug: 'XYZ'
};
return this.get({
data: data,
param: {
code: 200
}
});
}
allQA(page) {
let data = {
method: 'app.helper.allQA',
showPlatform: 'yohobuy_pc',
viewNum: 15,
page: page
};
return this.get({
data: data,
param: {
code: 200
}
});
}
onlineService() {
return this.get({
data: {
method: 'app.helper.getServiceOnline'
}
});
}
};
... ...
... ... @@ -6,376 +6,380 @@
'use strict';
const _ = require('lodash');
const helpApi = require('./help-api');
const HelpApi = require('./help-api');
const headerModel = require('../../../doraemon/models/header');
const pager = require(`${global.utils}/pager`).setPager;
/**
* 根据id获取当前所在位置，拼接面包屑
* @param id
* @param menuData
* @returns {*[]}
* @private
*/
const _getNav = (id, menuData, url)=> {
for (let i = 0; i < menuData.length; i++) {
if (menuData[i].subsets) {
for (let j = 0; j < menuData[i].subsets.length; j++) {
if (menuData[i].subsets[j].id === id) {
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
/**
* 根据id获取当前所在位置，拼接面包屑
* @param id
* @param menuData
* @returns {*[]}
* @private
*/
_getNav(id, menuData, url) {
for (let i = 0; i < menuData.length; i++) {
if (menuData[i].subsets) {
for (let j = 0; j < menuData[i].subsets.length; j++) {
if (menuData[i].subsets[j].id === id) {
return [
{
href: url,
name: menuData[i].categoryName
}, {
name: menuData[i].subsets[j].categoryName
}
];
}
}
} else {
if (menuData[i].id === id) {
return [
{
href: url,
name: menuData[i].categoryName
}, {
name: menuData[i].subsets[j].categoryName
}
];
}
}
} else {
if (menuData[i].id === id) {
return [
{
name: menuData[i].categoryName
}
];
}
}
}
};
// 首页链接组装
const _processLink = (list, id) => {
let params = '';
list = list || [];
_.forEach(list, d => {
if (id) {
params = 'id=' + id + '&contId=' + d.id;
} else {
params = 'id=' + d.id;
}
// 首页链接组装
_processLink(list, id) {
let params = '';
d.jumpLink = global.yoho.config.siteUrl + '/help/detail?' + params;
});
list = list || [];
return list;
};
_.forEach(list, d => {
if (id) {
params = 'id=' + id + '&contId=' + d.id;
} else {
params = 'id=' + d.id;
}
// 处理分类
const _processMenuType = (item) => {
let curMenu = {
id: item.id,
categoryName: item.categoryName
};
let subsets = [];
if (item.categoryItems) {
_.forEach(item.categoryItems, c => {
subsets.push({
id: c.id,
parendId: item.id,
categoryName: c.categoryName
});
d.jumpLink = global.yoho.config.siteUrl + '/help/detail?' + params;
});
curMenu.subsets = subsets;
return list;
}
return curMenu;
};
// 处理分类
_processMenuType(item) {
let curMenu = {
id: item.id,
categoryName: item.categoryName
};
// 统计当前分类下的内容是否大于1
const _processCountLength = (c) => {
if (!c.contentItems) {
return false;
} else {
return c.contentItems.length > 1;
}
};
let subsets = [];
// 首页模块内容处理
const _processHomeCategoryFaq = (list) => {
let result = {
menuData: []
};
if (item.categoryItems) {
_.forEach(item.categoryItems, c => {
subsets.push({
id: c.id,
parendId: item.id,
categoryName: c.categoryName
});
});
curMenu.subsets = subsets;
}
list = list || {};
return curMenu;
}
// 常见问题
if (list.faqs) {
result.menuData.push({
id: 1,
categoryName: '常见问题'
});
// 统计当前分类下的内容是否大于1
_processCountLength(c) {
if (!c.contentItems) {
return false;
} else {
return c.contentItems.length > 1;
}
}
_.forEach(list.categorys, (item) => {
let newCont = [];
// 首页模块内容处理
_processHomeCategoryFaq(list) {
let result = {
menuData: []
};
result.menuData.push(_processMenuType(item));
list = list || {};
if (item.categoryItems) {
item.categoryItems = _processLink(item.categoryItems);
} else {
item.contentItems = _processLink(item.contentItems, item.id);
// 常见问题
if (list.faqs) {
result.menuData.push({
id: 1,
categoryName: '常见问题'
});
}
switch (item.categoryName) {
case '新手指南':
_.forEach(list.categorys, (item) => {
let newCont = [];
_.forEach(item.categoryItems, (ng, k) => {
ng.index = k + 1;
});
result.menuData.push(this._processMenuType(item));
item.categoryItems = _.chunk(item.categoryItems, 6);
item.num = _.flattenDeep(item.categoryItems).length;
result.newGuide = item;
if (item.categoryItems) {
item.categoryItems = this._processLink(item.categoryItems);
} else {
item.contentItems = this._processLink(item.contentItems, item.id);
}
break;
case '公告':
_.forEach(item.contentItems, (c, k) => {
c.caption = c.caption.substring(0, 10);
c.index = k;
});
switch (item.categoryName) {
case '新手指南':
_.chunk(item.contentItems, 2).forEach(data => {
newCont.push({
row: data
_.forEach(item.categoryItems, (ng, k) => {
ng.index = k + 1;
});
});
result.notice = newCont;
break;
default:
break;
}
});
item.categoryItems = _.chunk(item.categoryItems, 6);
item.num = _.flattenDeep(item.categoryItems).length;
result.newGuide = item;
result.problem = {
categoryName: '常见问题',
list: list.faqs
};
break;
case '公告':
_.forEach(item.contentItems, (c, k) => {
c.caption = c.caption.substring(0, 10);
c.index = k;
});
return result;
};
_.chunk(item.contentItems, 2).forEach(data => {
newCont.push({
row: data
});
});
const returnCont = (data, contId) => {
let curCont = {};
result.notice = newCont;
break;
default:
break;
}
});
if (!data.contentItems) {
return;
}
result.problem = {
categoryName: '常见问题',
list: list.faqs
};
_.forEach(data.contentItems, c => {
if (c.id === contId) {
curCont = c;
}
});
return {
isShowMenu: _processCountLength(data),
id: data.id,
title: data.categoryName,
list: data.contentItems,
contId: contId ? contId : data.contentItems[0].id,
cont: contId ? curCont : data.contentItems[0]
};
};
return result;
}
// 处理详情内容
const _processDetailCont = (item, params) => {
let cont = false;
returnCont(data, contId) {
let curCont = {};
let _this = this;
if (item.contentItems && item.id === params.id) {
return returnCont(item, params.contId);
}
if (!data.contentItems) {
return;
}
if (item.categoryItems) {
_.forEach(item.categoryItems, c => {
if (c.id === params.id) {
cont = returnCont(c, params.contId);
_.forEach(data.contentItems, c => {
if (c.id === contId) {
curCont = c;
}
});
return cont;
}
return false;
};
// 处理搜索结果内容
const _processSearch = (list, params) => {
list = list || [];
if (list.total === 0) {
return {
error: true
isShowMenu: _this._processCountLength(data),
id: data.id,
title: data.categoryName,
list: data.contentItems,
contId: contId ? contId : data.contentItems[0].id,
cont: contId ? curCont : data.contentItems[0]
};
} else {
let page = pager(_.get(list, 'page_total', 0), {
page: params.page,
helpQuery: params.keywords
});
list = _.assign({
footPager: page
}, list);
}
return list;
};
// 处理详情内容
_processDetailCont(item, params) {
let cont = false;
let _this = this;
// 详情内容及分类数据
const _processDetailData = (result, params) => {
let menuData = [];
let contData = false;
let data = _.get(result, '[2].data', {});
let nav = [];
let seoData = {};
// 常见问题
if (data.faqs) {
menuData.push({
id: 1,
categoryName: '常见问题'
});
if (item.contentItems && item.id === params.id) {
return _this.returnCont(item, params.contId);
}
if (params.id === 1 && !params.keywords) {
let page = pager(_.get(result, '[3].data.page_total', 0), {
id: params.id,
page: params.page
if (item.categoryItems) {
_.forEach(item.categoryItems, c => {
if (c.id === params.id) {
cont = _this.returnCont(c, params.contId);
}
});
return cont;
}
return false;
}
contData = {
isShowMenu: _processCountLength(data.faqs),
id: 1,
commonProblem: true,
faqs: data.faqs,
allQa: _.get(result, '[3].data.list', []),
footPager: page
// 处理搜索结果内容
_processSearch(list, params) {
list = list || [];
if (list.total === 0) {
return {
error: true
};
} else {
let page = pager(_.get(list, 'page_total', 0), {
page: params.page,
helpQuery: params.keywords
});
list = _.assign({
footPager: page
}, list);
}
return list;
}
// 其它分类数据处理
_.forEach(data.categorys, item => {
let resCont;
// 详情内容及分类数据
_processDetailData(result, params) {
let menuData = [];
let contData = false;
let data = _.get(result, '[2].data', {});
let nav = [];
let _this = this;
// 常见问题
if (data.faqs) {
menuData.push({
id: 1,
categoryName: '常见问题'
});
menuData.push(_processMenuType(item));
if (params.id === 1 && !params.keywords) {
let page = pager(_.get(result, '[3].data.page_total', 0), {
id: params.id,
page: params.page
});
if (contData || params.keywords) {
return;
contData = {
isShowMenu: _this._processCountLength(data.faqs),
id: 1,
commonProblem: true,
faqs: data.faqs,
allQa: _.get(result, '[3].data.list', []),
footPager: page
};
}
}
resCont = _processDetailCont(item, params);
// 其它分类数据处理
_.forEach(data.categorys, item => {
let resCont;
if (resCont) {
contData = _.assign({
helpDetail: true
}, resCont);
}
});
if (contData.title) {
Object.assign(seoData, {
title: `有货${contData.title}|帮助中心|YOHO!BUY有货 100%正品保证`,
keywords: `${contData.title},有货${contData.title},有货${contData.title}帮助中心`,
description: `有货${contData.title}。
YOHO!BUY有货帮助中心${contData.title}频道，提供有关${contData.title}相关问题解答。YOHO!BUY有货100%品牌正品保证，支持货到付款。`
});
}
if (params.keywords) {
nav = [
{
name: '搜索结果'
menuData.push(_this._processMenuType(item));
if (contData || params.keywords) {
return;
}
];
} else {
nav = _getNav(params.id, menuData, params.url);
}
return {
nav: nav,
data: {
menuData: menuData,
contData: contData,
seoData: seoData
}
};
};
resCont = _this._processDetailCont(item, params);
// 自助服务数据处理
const _processServiceData = (data) => {
_.forEach(data, (item, k) => {
item.index = k + 1;
});
if (resCont) {
contData = _.assign({
helpDetail: true
}, resCont);
}
});
return _.chunk(data, 4);
};
if (params.keywords) {
nav = [
{
name: '搜索结果'
}
];
} else {
nav = _this._getNav(params.id, menuData, params.url);
}
// 首页
const helpData = (channel) => {
return Promise.all([
headerModel.requestHeaderData(channel),
helpApi.getHotSearch(),
helpApi.gethomeCategoryFaq(),
helpApi.getSelfService()
]).then(result => {
return {
headerData: _.get(result, '[0]', {}),
content: _.assign({
hotSearch: _.slice(_.get(result, '[1].data', []), 0, 4),
selfService: {
categoryName: '自助服务',
list: _processServiceData(_.get(result, '[3].data', []))
}
}, _processHomeCategoryFaq(_.get(result, '[2].data', {})))
nav: nav,
data: {
menuData: menuData,
contData: contData
}
};
});
};
}
// 详情
const detailData = (params) => {
let promiseData = [
headerModel.requestHeaderData(params.channel),
helpApi.getHotSearch(),
helpApi.gethomeCategoryFaq()
];
// 自助服务数据处理
_processServiceData(data) {
_.forEach(data, (item, k) => {
item.index = k + 1;
});
if (params.id === 1 && !params.keywords) {
promiseData.push(helpApi.allQA(params.page));
return _.chunk(data, 4);
}
return Promise.all(promiseData).then(result => {
let newData = _processDetailData(result, params);
// 首页
helpData(channel) {
let helpDataModel = new HelpApi(this.ctx);
let _this = this;
return Promise.all([
headerModel.requestHeaderData(channel),
helpDataModel.getHotSearch(),
helpDataModel.gethomeCategoryFaq(),
helpDataModel.getSelfService()
]).then(result => {
return {
headerData: _.get(result, '[0]', {}),
content: _.assign({
hotSearch: _.slice(_.get(result, '[1].data', []), 0, 4),
selfService: {
categoryName: '自助服务',
list: _this._processServiceData(_.get(result, '[3].data', []))
}
}, _this._processHomeCategoryFaq(_.get(result, '[2].data', {})))
};
});
}
_.set(newData, 'data.hotSearch', _.slice(_.get(result, '[1].data', []), 0, 4));
return {
headerData: _.get(result, '[0]', {}),
newData: newData
};
});
};
// 详情
detailData(params) {
// 搜索
const searchData = (params) => {
return helpApi.helpSearch(params).then(result => {
return _.assign({
keywords: params.keywords
}, _processSearch(_.get(result, 'data', []), params));
});
};
let helpDataModel = new HelpApi(this.ctx);
let promiseData = [
headerModel.requestHeaderData(params.channel),
helpDataModel.getHotSearch(),
helpDataModel.gethomeCategoryFaq()
];
let _this = this;
// 在线客服
const onlineService = () => {
return helpApi.onlineService().then(result => {
return _.get(result, 'data.url', '');
});
};
if (params.id === 1 && !params.keywords) {
promiseData.push(helpDataModel.allQA(params.page));
}
return Promise.all(promiseData).then(result => {
let newData = _this._processDetailData(result, params);
_.set(newData, 'data.hotSearch', _.slice(_.get(result, '[1].data', []), 0, 4));
return {
headerData: _.get(result, '[0]', {}),
newData: newData
};
});
}
// 搜索
searchData(params) {
let helpDataModel = new HelpApi(this.ctx);
let _this = this;
module.exports = {
helpData,
detailData,
searchData,
onlineService
return helpDataModel.helpSearch(params).then(result => {
return _.assign({
keywords: params.keywords
}, _this._processSearch(_.get(result, 'data', []), params));
});
}
// 在线客服
onlineService() {
let helpDataModel = new HelpApi(this.ctx);
return helpDataModel.onlineService().then(result => {
return _.get(result, 'data.url', '');
});
}
};
... ...
... ... @@ -5,7 +5,7 @@ let couponsModel = require('../models/coupons-model');
const index = (req, res, next)=>{
let uid = req.user.uid;
couponsModel.couponsData(uid, req.query).then(result => {
req.ctx(couponsModel).couponsData(uid, req.query).then(result => {
res.render('coupons', result);
}).catch(next);
};
... ...
'use strict';
const vipModel = require('../models/vip-service');
const index = (req, res, next)=>{
const index = (req, res, next) => {
let uid = req.user.uid;
vipModel.vipIndex(uid).then(result => {
req.ctx(vipModel).vipIndex(uid).then(result => {
res.render('vip', result);
}).catch(next);
};
const details = (req, res, next) => {
let uid = req.user.uid;
req.ctx(vipModel).getVipRecord(uid, req.query || {}).then(result => {
res.render('vip-details', result);
}).catch(next);
};
module.exports = {
index
index,
details
};
... ...
... ... @@ -18,148 +18,146 @@ const UNUSED = 'notuse';
const USED = 'use';
const INVALID = 'overtime';
const getCouponsList = (uid, type, page, limit)=>{
return co(function*() {
let couponsInfo = yield UserData.getCouponsList(uid, type, page, limit);
let result = [],
coupons = _.get(couponsInfo, 'data.couponList');
if (!coupons) {
return {
list: result
};
}
if (coupons) {
coupons.forEach(function(item, i) {
result[i] = {};
result[i].id = item.couponId;
result[i].code = item.couponCode;
// 格式化有效日期 "couponValidity": "2016.03.15-2016.03.31"
let dates = item.couponValidity.split('-'),
extra = ['秒杀', '限定', '境外', '预售'],
limits = _.get(item, 'shopPriceLimits', '');
result[i].beginTime = dates[0];
result[i].endTime = dates[1];
if (!item.couponImageUrl) {
result[i].img = '//static.yohobuy.com/images/v2/activity/default_coupon.jpg';
} else {
result[i].img = item.couponImageUrl;
}
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
result[i].value = item.couponValue;
result[i].validity = item.couponValidity;
result[i].useRemark = item.couponDetailInfomation;
if (!_.isEmpty(item.sortNameLimit)) {
result[i].categorys = item.sortNameLimit.join('、');
}
if (!_.isEmpty(item.brandNameLimit)) {
result[i].brands = item.brandNameLimit.join('、');
}
if (limits.indexOf('1') >= 0) {
extra.push('3折以下');
}
if (limits.indexOf('2') >= 0) {
extra.push('限量');
}
getCouponsList(uid, type, page, limit) {
let userDataModel = new UserData(this.ctx);
result[i].extraPro = extra.join('、');
result[i].isNoLimit = item.isNoLimit === 'true' ? true : false;
result[i].explains = _.isEmpty(item.explains) ? false : item.explains;
result[i].proListUrl = helpers.urlFormat('', {cpc_id: item.couponId,
phrase: encodeURIComponent('以下商品可使用 【' + item.couponDetailInfomation + '】优惠券')}, 'list');
result[i].rule = item.rule4ShortName || '';
result[i].overState = item.overState || '';
if (type === USED) {
result[i].orderNum = _.get(item, 'orderCode', '');
result[i].orderDetailUrl = helpers.urlFormat('/home/orders/detail',
{orderCode: item.orderCode || ''});
result[i].orderSum = _.get(item, 'orderPrice', 0).toFixed(2);
result[i].payment = _.get(item, 'actuallyPaid', 0).toFixed(2);
let date = item.usedTime ? moment(item.usedTime).format('YYYY-MM-DD H:m') : 0;
if (date) {
result[i].useTime = date;
return co(function*() {
let couponsInfo = yield userDataModel.getCouponsList(uid, type, page, limit);
let result = [],
coupons = _.get(couponsInfo, 'data.couponList');
if (!coupons) {
return {
list: result
};
}
if (coupons) {
coupons.forEach(function(item, i) {
result[i] = {};
result[i].id = item.couponId;
result[i].code = item.couponCode;
// 格式化有效日期 "couponValidity": "2016.03.15-2016.03.31"
let dates = item.couponValidity.split('-'),
extra = ['秒杀', '限定', '境外', '预售'],
limits = _.get(item, 'shopPriceLimits', '');
result[i].beginTime = dates[0];
result[i].endTime = dates[1];
if (!item.couponImageUrl) {
result[i].img = '//static.yohobuy.com/images/v2/activity/default_coupon.jpg';
} else {
result[i].useTime = '';
result[i].img = item.couponImageUrl;
}
} else {
result[i].status = item.isValidity ? '可使用' : '已过期';
}
if (item.couponType) {
result[i].type = item.couponType;
if (Number(item.couponType) === 5) {
result[i].value = '免邮';
result[i].value = item.couponValue;
result[i].validity = item.couponValidity;
result[i].useRemark = item.couponDetailInfomation;
if (limits.indexOf('1') >= 0) {
extra.push('3折以下');
}
}
if (limits.indexOf('2') >= 0) {
extra.push('限量');
}
result[i].notes = item.notes;
result[i].proListUrl = helpers.urlFormat('', {cpc_id: item.couponId, coupon_code: item.couponCode,
phrase: encodeURIComponent('以下商品可使用 【' + item.couponDetailInfomation + '】优惠券')}, 'list');
result[i].rule = item.rule4ShortName || '';
result[i].overState = item.overState || '';
if (type === USED) {
result[i].orderNum = _.get(item, 'orderCode', '');
result[i].orderDetailUrl = helpers.urlFormat('/home/orders/detail',
{orderCode: item.orderCode || ''});
result[i].orderSum = _.get(item, 'orderPrice', 0).toFixed(2);
result[i].payment = _.get(item, 'actuallyPaid', 0).toFixed(2);
let date = item.usedTime ? moment(item.usedTime).format('YYYY-MM-DD H:m') : 0;
if (date) {
result[i].useTime = date;
} else {
result[i].useTime = '';
}
} else {
result[i].status = item.isValidity ? '可使用' : '已过期';
}
if (item.couponType) {
result[i].type = item.couponType;
if (Number(item.couponType) === 5) {
result[i].value = '免邮';
}
}
});
}
let pageNum = pager(couponsInfo.data.total, {
page: page,
limit: limit,
type: type
});
}
let pageNum = pager(couponsInfo.data.total, {
page: page,
limit: limit,
type: type
});
return {
list: result,
pager: Object.assign({
count: couponsInfo.data.total || 0,
curPage: page,
totalPages: couponsInfo.data.totalPageNum
}, pageNum)
};
})();
};
const couponsData = (uid, params)=>{
let type = params.type || UNUSED;
let page = params.page || 1;
let limit = params.limit || 10;
return co(function*() {
let coupons = yield getCouponsList(uid, type, page, limit);
let data = {};
if (type === UNUSED) {
data.unUseCoupons = !coupons.list.length ? {empty: '您没有优惠券'} : coupons.list;
data.unUse = true;
} else if (type === USED) {
data.usedCoupons = !coupons.list.length ? {empty: '您没有优惠券'} : coupons.list;
data.used = true;
} else if (type === INVALID) {
data.noValidCoupons = !coupons.list.length ? {empty: '您没有优惠券'} : coupons.list;
data.noValid = true;
}
data.tabs = [
{
active: type === UNUSED ? true : false,
url: helpers.urlFormat('/home/coupons', {type: UNUSED}),
name: '未使用优惠券'
},
{
active: type === USED ? true : false,
url: helpers.urlFormat('/home/coupons', {type: USED}),
name: '已使用优惠券'
},
{
active: type === INVALID ? true : false,
url: helpers.urlFormat('/home/coupons', {type: INVALID}),
name: '已失效优惠券'
return {
list: result,
pager: Object.assign({
count: couponsInfo.data.total || 0,
curPage: page,
totalPages: couponsInfo.data.totalPageNum
}, pageNum)
};
})();
}
couponsData(uid, params) {
let type = params.type || UNUSED;
let page = params.page || 1;
let limit = params.limit || 10;
let _this = this;
return co(function*() {
let coupons = yield _this.getCouponsList(uid, type, page, limit);
let data = {};
if (type === UNUSED) {
data.unUseCoupons = !coupons.list.length ? {empty: '您没有优惠券'} : coupons.list;
data.unUse = true;
} else if (type === USED) {
data.usedCoupons = !coupons.list.length ? {empty: '您没有优惠券'} : coupons.list;
data.used = true;
} else if (type === INVALID) {
data.noValidCoupons = !coupons.list.length ? {empty: '您没有优惠券'} : coupons.list;
data.noValid = true;
}
];
data.pager = coupons.pager;
data.tabs = [
{
active: type === UNUSED ? true : false,
url: helpers.urlFormat('/home/coupons', {type: UNUSED}),
name: '未使用优惠券'
},
{
active: type === USED ? true : false,
url: helpers.urlFormat('/home/coupons', {type: USED}),
name: '已使用优惠券'
},
{
active: type === INVALID ? true : false,
url: helpers.urlFormat('/home/coupons', {type: INVALID}),
name: '已失效优惠券'
}
];
return data;
})();
};
data.pager = coupons.pager;
module.exports = {
couponsData
return data;
})();
}
};
... ...
... ... @@ -261,8 +261,8 @@ const getMessageDetail = (uid, params, limit) => {
coupons.push({
id: value.id,
remark: value.couponName || '',
useTime: _.get(value, 'body.use_time', ''),
pickTime: _.get(value, 'body.collar_time', ''),
useTime: _.get(msg, 'body.use_time', ''),
pickTime: _.get(msg, 'body.collar_time', ''),
canPick: true
});
});
... ...
... ... @@ -533,7 +533,7 @@ const getOrderExchange = (orderCode, uid) => {
skc: value.product_skc,
sku: value.product_sku,
goods_type_id: value.goods_type_id,
reason: returnReason
reason: _.cloneDeep(returnReason)
};
// tar note 为每个特殊商品都添加标识
... ... @@ -544,13 +544,13 @@ const getOrderExchange = (orderCode, uid) => {
remark2: remarks[1] || ''
};
// tar note 对数组做处理，为不显示的添加 inactive
if (result.data.special_exchange_reason) {
let spReason = result.data.special_exchange_reason;
let spReason = _.get(result, 'data.special_exchange_reason', []);
_.forEach(item.reason, (subVal, subKey) => { // eslint-disable-line
if (_.indexOf(spReason, subKey)) {
_.set(item, `reason[${subKey}].inactive`, true);
// tar note 对数组做处理，为不显示的添加 inactive
if (spReason && spReason.length) {
_.forEach(item.reason, subVal => { // eslint-disable-line
if (!_.filter(spReason, ['id', subVal.id]).length) {
subVal.inactive = true;
}
});
}
... ... @@ -600,6 +600,7 @@ const getOrderExchange = (orderCode, uid) => {
color: val.factory_goods_name,
colorId: val.color_id,
goodsId: val.goods_id,
skc: val.product_skc,
sizeList: size
});
}
... ...
'use strict';
const api = global.yoho.API;
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
const getVIPInfoByUid = (uid)=>{
let options = {
method: 'app.passport.vip',
uid: uid,
private_key: '0ed29744ed318fd28d2c07985d3ba633'
};
getVIPInfoByUid(uid) {
let options = {
method: 'app.passport.growthvip',
uid: uid
};
return api.get('', options);
};
return this.get({data: options});
}
const getCouponsList = (uid, type, page, limit)=>{
page = page || 1;
type = type || 'notuse';
limit = limit || 10;
/**
* [vip累计记录]
* @param {[uid:uid,limit:每页数量, page:第几页]} params [参数]
* @return {[type]} [description]
*/
getVipRecord(params) {
let options = {
method: 'app.passport.growthhistory'
};
let options = {
method: 'app.coupons.lists',
uid: uid,
type: type,
page: page,
limit: limit
};
if (params.type === 2) {
options = Object.assign({method: 'app.passport.growthvip'});
delete params.type;
}
return api.get('', options);
};
return this.get({data: Object.assign(options, params)});
}
getVipRecordDemo(params) {
let options = {
method: 'app.inbox.getlistnew'
};
return this.get({data: Object.assign(options, params)});
}
getCouponsList(uid, type, page, limit) {
page = page || 1;
type = type || 'notuse';
limit = limit || 10;
let options = {
method: 'app.coupons.lists',
uid: uid,
type: type,
page: page,
limit: limit
};
module.exports = {
getVIPInfoByUid,
getCouponsList
return this.get({data: options});
}
};
... ...
'use strict';
const Promise = require('bluebird');
const co = Promise.coroutine;
const userData = require('./user-data');
const moment = require('moment');
const helpers = global.yoho.helpers;
const vipIndex = (uid)=>{
return co(function*() {
let vipInfo = yield userData.getVIPInfoByUid(uid);
let data = vipInfo.data, proportion = '0%';
if (+data.next_need_cost !== 0) {
proportion = data.current_year_cost * 100 / data.next_need_cost;
proportion = proportion > 100 ? 100 : proportion;
proportion = proportion + '%';
}
let remainDays = Math.ceil(((data.vip_end_time) * 1000 - Date.now()) / 86400000);
let preferences = [];
if (data.enjoy_preferential) {
preferences = data.enjoy_preferential.map(function(item) {
return {
id: item.id,
favTxt: item.title,
imgType: helpers.https(item.pic),
description: item.description
};
});
}
let isVip = data.current_vip_level > 0 ? true : false;
let vip = {
title: data.current_vip_title,
nextTitle: data.next_vip_title,
nextLevel: data.next_vip_level,
yearCost: Number(data.current_year_cost).toFixed(2),
totalCost: (+data.current_total_cost).toFixed(2),
list: preferences,
level: data.current_vip_level,
platinum: data.upgrade_need_cost > 0 ? false : true,
nextCost: Number(data.next_need_cost).toFixed(2),
balan: Number(data.upgrade_need_cost).toFixed(2),
proportion: proportion,
vipLevel: data.next_vip_title,
reach: moment(data.vip_reach_time * 1000).format('YYYY.MM.DD'),
valid: moment(data.vip_start_time * 1000).format('YYYY.MM.DD'),
end: moment(data.vip_end_time * 1000).format('YYYY.MM.DD'),
remainDays: remainDays,
doubtLevel: isVip,
commonVip: !isVip,
morePreferences: helpers.urlFormat('/help/detail', {id: 7})
};
return vip;
})();
};
const UserData = require('./user-data');
const _ = require('lodash');
const setPager = require(`${global.utils}/pager`).setPager;
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
vipIndex(uid) {
let userDataModel = new UserData(this.ctx);
return userDataModel.getVIPInfoByUid(uid).then(vipInfo => {
let vip = {};
let data = {};
let scale = 1 / 3; // 分三等份
if (vipInfo.code !== 200) {
return vip;
}
data = vipInfo.data || {};
vip.level = parseInt(data.current_vip_level, 10) || 0;
vip.current_total_growth = parseInt(data.current_total_growth, 10) || 0;
vip.grades = [
{name: '普通会员', val: 0},
{name: '银卡会员', val: 800},
{name: '金卡会员', val: 3000},
{name: '白金会员', val: 7000}
];
// 还须要成长值
if (vip.grades[vip.level + 1]) {
vip.need_total_growth = vip.grades[vip.level + 1].val - vip.current_total_growth;
vip.need_total_growth = vip.need_total_growth > 0 ? vip.need_total_growth : 0;
}
// 进度条百分比
vip.current_total_percent = 100;
if (vip.current_total_growth <= vip.grades[1].val) {
vip.current_total_percent = (vip.current_total_growth * scale / vip.grades[1].val);
} else if (vip.current_total_growth <= vip.grades[2].val) {
vip.current_total_percent = (vip.current_total_growth * scale / vip.grades[2].val + scale);
} else if (vip.current_total_growth <= vip.grades[3].val) {
vip.current_total_percent = (vip.current_total_growth * scale / vip.grades[3].val + scale * 2);
}
vip.current_total_percent = (vip.current_total_percent * 100).toFixed(2);
vip.user_name = decodeURIComponent(this.ctx && this.ctx.req && this.ctx.req.user.name || '');
return vip;
});
}
getVipRecord(uid, params) {
let page = parseInt(params.page, 10) || 1;
let size = parseInt(params.size, 10) || 1;
let type = parseInt(params.type, 10) || 1;
let userDataModel = new UserData(this.ctx);
type = type > 0 && type < 3 ? type : 1;// 1 or 2
return userDataModel.getVipRecord({
uid: uid,
page: page,
size: size || 10,
type: type
}).then(d => {
let resData = {type: type};
if (d.code !== 200) {
return resData;
}
d.data = d.data || {};
let pagerList = setPager(_.get(d.data, 'pageSize', 1), Object.assign(params, {page: page}));
let total = _.get(d.data, 'total', 0);
resData.pager = Object.assign({
count: total,
curPage: total === 0 ? 0 : page,
totalPages: _.get(d.data, 'pageSize', 0)
}, pagerList);
if (type === 2) {
let liverData = [];
if (d.data.sliver_start_time) {
liverData.push({time: d.data.sliver_start_time, content: '普通升级银卡'});
}
if (d.data.gold_start_time) {
liverData.push({time: d.data.gold_start_time, content: '银卡升级金卡'});
}
if (d.data.whitegold_start_time) {
liverData.push({time: d.data.whitegold_start_time, content: '金卡升级白金'});
}
if (liverData.length) {
// 最多三条记录，默认显示分页数据
resData.pager = Object.assign({
count: 1,
curPage: 1,
totalPages: 1
});
}
resData.data = liverData;
return resData;
}
module.exports = {
vipIndex
resData.data = d.data.data;
return resData;
});
}
};
... ...
... ... @@ -104,6 +104,7 @@ router.get('/redenvelopes', tabsMiddleware.getCommonHeader, redenvelopesControll
/* 我的VIP */
router.get('/vip', tabsMiddleware.getCommonHeader, vipController.index);
router.get('/vip/details', tabsMiddleware.getCommonHeader, vipController.details);
/* 我的优惠卷 */
router.get('/coupons', tabsMiddleware.getCommonHeader, couponsController.index);
... ...
... ... @@ -41,11 +41,7 @@
</div>
<div class="coupons-info">
<div class="coupons-text">
{{#categorys}}<p>限品类：{{.}}</p>{{/categorys}}
{{#brands}}<p>限品牌：{{.}}</p>{{/brands}}
{{#if isNoLimit}}<p>全场通用</p>{{/if}}
<p>特例商品（{{extraPro}}等特例商品）暂不支持使用优惠券。</p>
{{#explains}}<p>说明：{{.}}</p>{{/explains}}
{{notes}}
</div>
</div>
<div class="coupons-opt">
... ...
... ... @@ -60,17 +60,25 @@
<label>{{banMsg}}</label>
</td>
{{^}}
<td class="return-reason-wrap">
<select class="return-reason">
<option value="0">请选择换货原因</option>
{{# reason}}
<option value="{{id}}" {{#if inactive}}disabled{{/if}}>{{name}}</option>
{{/ reason}}
</select>
</td>
<td class="exchange-choose-wrap">
<p>
颜色要换成:
<select class="exchange-color" {{#if isLimitSkn}}disabled{{/if}}>
<option value="0">请选择颜色</option>
{{# colorSize}}
<option value="{{goodsId}}">{{color}}</option>
<option value="{{skc}}">{{color}}</option>
{{/ colorSize}}
</select>
{{# colorSize}}
<ul class="sizeinfo" data-id="{{goodsId}}">
<ul class="sizeinfo" data-id="{{skc}}">
{{#each sizeList}}
<li data-id={{product_sku}} data-name={{size_name}}></li>
{{/each}}
... ... @@ -79,19 +87,11 @@
</p>
<p>
尺码要换成:
<select class="exchange-size" {{#if isLimitSkn}}disabled{{/if}}>
<select class="exchange-size" data-sku="{{sku}}" data-skc="{{skc}}" {{#if isLimitSkn}}disabled{{/if}}>
<option value="0">请选择尺码</option>
</select>
</p>
</td>
<td class="return-reason-wrap">
<select class="return-reason">
<option value="0">请选择换货原因</option>
{{# reason}}
<option value="{{id}}" {{#if inactive}}disabled{{/if}}>{{name}}</option>
{{/ reason}}
</select>
</td>
{{/if}}
</tr>
<tr class="problem-description">
... ...
<div class="vip-me-page me-page yoho-page clearfix">
{{> path}}
{{> navigation}}
<div class="me-main">
<div class="vip-details block">
<h2 class="title"></h2>
<div class="msg-tabs-wrap">
<ul class="tabs-list clearfix">
<li class="{{#isEqual type 1}}active{{/isEqual}}">
<a href="/home/vip/details?type=1">我的成长值详情</a>
</li>
<li class="{{#isEqual type 2}}active{{/isEqual}}">
<a href="/home/vip/details?type=2">我的成长值记录</a>
</li>
</ul>
</div>
<div class="message-container">
{{#isEqual type 1}}
<div class="t-table">
<div class="t-header">
<div>来源</div>
<div>变化量</div>
<div>变化日期</div>
</div>
{{#each ../data}}
<div class="t-list">
<div>{{typeDesc}}</div>
<div>{{growthValue}}</div>
<div>{{dateFormat 'YYYY-MM-DD' createTime}}</div>
</div>
{{/each}}
</div>
{{else}}
<div class="t-table type-2">
<div class="t-header">
<div>时间</div>
<div>成长记录</div>
</div>
{{#each ../data}}
<div class="t-list">
<div>{{dateFormat 'YYYY-MM-DD' time}}</div>
<div>{{content}}</div>
</div>
{{/each}}
</div>
{{/isEqual}}
</div>
{{> pager}}
</div>
</div>
</div>
... ...
<div class="vip-me-page me-page yoho-page clearfix">
{{> path}}
{{> navigation}}
{{> path}}
{{> navigation}}
<div class="me-main">
<div class="my-vip block">
<h2 class="title"></h2>
{{#unless commonVip}}
<div class="vip-level">
<span class="level">您的会员级别：</span>
<div class="vipimg{{level}}"></div>
</div>
<div class="vip-level">
<span class="level">当前可享优惠：</span>
<div class="favimg">
{{#each list}}
<div class="list">
<img src="{{image2 imgType}}" class="imgsrc"/>
<div class="fav-font">{{favTxt}}</div>
</div>
{{/each}}
<div class="me-main">
<div class="member-progress block">
<h2 class="title"><a class="ident right cursor-p" href="/home/vip/details">查看成长值记录></a></h2>
<div class="vip-level">
<div class="user">
<div class="group">
<span class="name">{{user_name}}</span>
<span class="vip-img{{level}}"></span>
<span class="info">
我的成长值:<span class="adolesce-val" data-percent={{current_total_percent}}>{{current_total_growth}}</span>&nbsp;&nbsp;
{{#if need_total_growth}}
下次升级还需:<span class="adolesce-val">{{need_total_growth}}</span>
{{/if}}
</span>
</div>
</div>
{{/unless}}
<div class="vip-level">
<span class="level">年度累计金额：</span>
<div class="year-amount">
<div class="amount">￥{{yearCost}}</div>
<span class="ps">VIP金额累计需要订单成功签收且无退换货</span>
{{#if platinum}}
<div class="plalevel"></div>
{{else}}
<div class="amount-length">
<div class="img-length">
<div class="amount-left">
<div class="img-left" style="width:{{proportion}}"></div>
<div class="img-right"></div>
</div>
<div class="letter">
{{yearCost}}/<span class="sum">{{nextCost}}</span>
</div>
</div>
</div>
<div class="change-img{{level}}"></div>
<div class="balance">
<p>还差￥<span class="balan">{{balan}}</span>元就可以升级为{{vipLevel}}！</p>
<a href="{{morePreferences}}">更多优惠</a>
<div class="progress-f">
<div class="progress-center">
<ul class="progress">
{{#grades}}
<li class="{{#if @last}}last{{/if}}">
<div class="p-footer">
<p>{{name}}</p>
<p>{{val}}</p>
</div>
</li>
{{/grades}}
</ul>
</div>
{{/if}}
</div>
</div>
<div class="history">
<div class="level">历史消费总额：
<span class="hisamout">￥{{totalCost}}</span>
</div>
<div class="user-info">
<p>会员等级介绍：</p>
<p>1.注册成功即为普通会员，各会员等级均按照历史累计有效的成长值升降级，会员等级越高可享受会员权益越多。<a class="ident" href="/help/detail?id=7">了解等级规则></a></p>
<p>2.成长值为有货会员通过购物、评价、登录等获得的经验累积值。</p>
<p>3.会员升级后，会员等级有效期一年。每365天进行累计成长值扣减，扣减后的成长值不满足当前级别条件的，直接降级至对应成长值级别。</p>
<p>
自成为银卡之日开始，365天内未继续晋级更高级别，则在366天扣减当前级别所需成长值，扣减值为400
</p>
<p>
自成为金卡之日开始，365天内未继续晋级更高级别，则在366天扣减当前级别所需成长值，扣减值为1500
</p>
<p>
自成为白金卡之日开始，365天内未继续晋级更高级别，则在366天扣减当前级别所需成长值，扣减值为3500
</p>
</div>
</div>
</div><!--member-progress-->
<div class="line"></div>
{{#unless commonVip}}
<div class="valid">
<div class="level">当前有效期：</div>
<div class="valid-time">
<div class="time-line"></div>
<div class="time1">
<div class="time1-img"></div>
</div>
<div class="time2">
<div class="time-top">
<span>{{reach}}</span><br>条件达成日期
</div>
<div class="time2-img"></div>
</div>
<div class="time3">
<div class="time-left">
<span>{{valid}}</span><br>生效日期
</div>
<div class="time-right">
<span>{{end}}</span><br>优惠截止日期
</div>
<div class="time3-img">VIP有效期{{remainDays}}天（数字年）</div>
</div>
<div class="time4">
<div class="time-top">
<a href="{{morePreferences}}">延长有效期></a>
</div>
<div class="time4-img"></div>
</div>
</div>
</div>
<div class="line"></div>
{{/unless}}
<div class="doubt">
<div class="member-info block">
<h2 class="title"></h2>
<div class="vip-level">
<table>
<thead>
<tr>
<th>场景</th>
<th>获取规则</th>
<th>成长数值</th>
</tr>
</thead>
<tbody>
<tr>
<td>购物</td>
<td>按商品实际付款金额1元累计1个成长值，订单完成后奖励</td>
<td>等于实际付款金额</td>
</tr>
<tr>
<td>月度购物次数</td>
<td>自然月内达到<span class="ident">1个</span>购物天数且订单已完成</td>
<td>20</td>
</tr>
<tr>
<td>完善资料</td>
<td>完善个人资料</td>
<td>50</td>
</tr>
<tr>
<td>手机邮箱验证</td>
<td>完成手机邮箱双验证</td>
<td>20</td>
</tr>
<tr>
<td>VIP登录</td>
<td>VIP每日登录<span class="ident">2个</span>成长值</td>
<td>2</td>
</tr>
<tr>
<td>评价</td>
<td>评价成功且审核通过10个成长值，一个商品仅限一次</td>
<td>10</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="3">
<p>扣除成长值的情况：</p>
<p>1.发生退货或删除评价，扣除当时获得的成长值。</p>
</td>
</tr>
</tfoot>
</table>
</div>
</div><!--member-info-->
</div>
<div class="member-legal block">
<h2 class="title"></h2>
<div class="vip-level">
<table>
<thead>
<tr>
<th>等级与权益</th>
<th>普通会员</th>
<th>银卡会员</th>
<th>金卡会员</th>
<th>白金会员</th>
</tr>
</thead>
<tbody>
<tr>
<td>购物折扣</td>
<td><i class="iconfont">&#xe63c;</i></td>
<td>9.5折</td>
<td>9.0折</td>
<td>8.8折</td>
</tr>
<tr>
<td>优惠信息</td>
<td><i class="iconfont">&#xe6cb;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
</tr>
<tr>
<td>VIP活动优惠</td>
<td><i class="iconfont">&#xe63c;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
</tr>
<tr>
<td>生日特惠</td>
<td><i class="iconfont">&#xe63c;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
</tr>
<tr>
<td>免邮服务</td>
<td><i class="iconfont">&#xe63c;</i></td>
<td><i class="iconfont">&#xe63c;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
</tr>
<tr>
<td>快速送达服务</td>
<td><i class="iconfont">&#xe63c;</i></td>
<td><i class="iconfont">&#xe63c;</i></td>
<td><i class="iconfont">&#xe63c;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
</tr>
<tr>
<td>电子杂志赠阅</td>
<td><i class="iconfont">&#xe6cb;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
<td><i class="iconfont">&#xe6cb;</i></td>
</tr>
</tbody>
</table>
</div>
</div>
</div><!--member-legal-->
</div>
</div>
... ...
... ... @@ -78,6 +78,13 @@ const syncUserSession = (user, req, res) => {
res.cookie('_UID', uidCookie, {
domain: config.cookieDomain
});
// 个性化推荐id
res.cookie('_PRID', encryptionUid, {
expires: new Date(Date.now() + 86400 * 360),
domain: config.cookieDomain
});
res.cookie('isStudent', isStudent, {
domain: config.cookieDomain
});
... ...
... ... @@ -7,7 +7,7 @@
</div>
<p class="success-text-main">恭喜您！您已经成功修改了登录密码</p>
<p class="success-text-tip"><span id="count-down">3</span>秒后自动跳转至登录页</p>
<a class="success-btn" href="{{refer}}">重新登录</a>
<a class="success-btn" href="{{{refer}}}">重新登录</a>
</div>
{{/ resetSuccess}}
</div>
... ... @@ -16,14 +16,13 @@
var count = 3,
countDown = document.getElementById('count-down');
var timer = setInterval(function(){
if (count > 1) {
count--;
countDown.innerHTML = count;
} else {
clearInterval(timer);
location.href = '{{resetSuccess.refer}}';
location.href = '{{{resetSuccess.refer}}}';
}
}, 1000);
})();
... ...
... ... @@ -157,7 +157,7 @@ const num = (req, res, next) => {
res.json(result);
}).catch(next);
}
res.json({});
};
... ...
... ... @@ -86,29 +86,30 @@ exports.index = (req, res, next) => {
let resData = {};
let qs = decodeURIComponent(req._parsedOriginalUrl.query || '');
list.getListData(Object.assign(req.query, {uid: req.user.uid}), req.yoho.channel).then(result => {
Object.assign(resData, result);
list.getListData(Object.assign(req.query, {uid: req.user.uid, prid: req.user.prid}),
req.yoho.channel).then(result => {
Object.assign(resData, result);
if (qs) {
Object.assign(resData, listSeoMap[qs] || {});
}
if (qs) {
Object.assign(resData, listSeoMap[qs] || {});
}
// 查询结果为空则不cache
if (_.isEmpty(_.get(resData, 'list.goods', []))) {
res.set('Cache-Control', 'no-cache');
}
// 查询结果为空则不cache
if (_.isEmpty(_.get(resData, 'list.goods', []))) {
res.set('Cache-Control', 'no-cache');
}
// 商品详情页跳转过来带参数
if (req.query.phrase) {
try {
resData.list.phrase = decodeURIComponent(req.query.phrase);
} catch (e) {
resData.list.phrase = '';
// 商品详情页跳转过来带参数
if (req.query.phrase) {
try {
resData.list.phrase = decodeURIComponent(req.query.phrase);
} catch (e) {
resData.list.phrase = '';
}
}
}
res.render('list/index', resData);
}).catch(next);
res.render('list/index', resData);
}).catch(next);
};
/**
... ...
... ... @@ -36,16 +36,17 @@ const index = (req, res, next) => {
return;
}
return search.getSearchData(Object.assign(params, {uid: req.user.uid}), req.yoho.channel).then(result => {
Object.assign(resData, result);
return search.getSearchData(Object.assign(params, {uid: req.user.uid, prid: req.user.prid}),
req.yoho.channel).then(result => {
Object.assign(resData, result);
if (!_.get(resData, 'search.goods') || !_.get(resData, 'search.goods').length) {
_.set(resData, 'search.keyWord', req.query.query);
return res.render('search/no-result', resData);
}
res.render('search/index', resData);
if (!_.get(resData, 'search.goods') || !_.get(resData, 'search.goods').length) {
_.set(resData, 'search.keyWord', req.query.query);
return res.render('search/no-result', resData);
}
res.render('search/index', resData);
});
});
}).catch(next);
};
... ...
... ... @@ -82,10 +82,12 @@ const _handelGlobalSort = (origin, params, originParams) => {
_.forEach(origin, value => {
let equalCategory = _checkSortEqual(value.relation_parameter, originParams);
let category = {
categoryId: value.category_id,
name: value.category_name,
num: value.node_count,
childList: [
{
categoryId: value.category_id,
name: `全部${value.category_name}`,
num: value.node_count,
href: `${searchHandler.handleFilterUrl(params, value.relation_parameter)}`,
... ... @@ -108,6 +110,7 @@ const _handelGlobalSort = (origin, params, originParams) => {
_.forEach(value.sub, subValue => {
let child = {
categoryId: subValue.category_id,
name: subValue.category_name,
num: subValue.node_count,
href: `${searchHandler.handleFilterUrl(params, subValue.relation_parameter)}`,
... ... @@ -197,6 +200,7 @@ const getGlobalProductListData = (params, yoho) => {
// pathNav brand
let pathInfo = {};
let fillCondition = _.get(resData, 'list.filters.checkedConditions.conditions');
if (dps.brand) {
let brandName = _.get(result.brand, 'data.brand_name', '');
... ... @@ -205,6 +209,12 @@ const getGlobalProductListData = (params, yoho) => {
pathInfo.brand = {
name: brandName
};
// 添加品信息for seo
fillCondition = _.concat([{
name: brandName,
itemType: 'brand'
}], fillCondition);
}
}
... ... @@ -216,6 +226,12 @@ const getGlobalProductListData = (params, yoho) => {
}
Object.assign(resData.list, _handelGlobalPathNav(pathInfo, yoho.channel, 'global-list'));
let seo = searchHandler.getListSeo(yoho.channel,
_.get(resData, 'list.leftContent.allSort.list'),
fillCondition);
Object.assign(resData, seo);
}
return resData;
... ...
... ... @@ -75,7 +75,7 @@ const getListData = (params, channel) => {
// 调用接口
let apiMethod = [
headerModel.requestHeaderData(channel),
searchApi.getSortList(Object.assign({}, {msort: '', misort: ''})),
searchApi.getSortList({}, channel),
searchApi.getProductList(searchParams, 'categoryList')
];
... ... @@ -112,15 +112,15 @@ const getListData = (params, channel) => {
});
finalResult.list = Object.assign(
searchHandler.handlePathNavData(result[1].data.sort, params, 'sort', channel), {
leftContent: searchHandler.handleSortData(result[1].data.sort, dps, params)
searchHandler.handlePathNavData(result[1].data, params, 'sort', channel), {
leftContent: searchHandler.handleSortData(result[1].data, dps, params)
});
}
// 获取商品数据和顶部筛选条件
if (result[2].code === 200) {
let filters = Object.assign(searchHandler.handleFilterDataAll(result[2].data, params),
finalResult.list.leftContent.sort);
_.get(finalResult, 'list.leftContent.sort', {}));
filters.checkedConditions.conditions = _.concat(filters.checkedConditions.conditions,
finalResult.list.leftContent.checked);
... ... @@ -171,7 +171,7 @@ const getListNewData = (params, channel) => {
// 调用接口
let apiMethod = [
headerModel.requestHeaderData(channel),
searchApi.getSortList(Object.assign({}, {msort: '', misort: ''})),
searchApi.getSortList({}, channel),
searchApi.getProductList(Object.assign(searchParams), 'newProduct'),
searchApi.getWeekNew(params)
];
... ... @@ -196,8 +196,8 @@ const getListNewData = (params, channel) => {
// 获取左侧类目数据
if (result[1].code === 200) {
finalResult.list = Object.assign(
searchHandler.handlePathNavData(result[1].data.sort, params, 'new', channel), {
leftContent: searchHandler.handleSortData(result[1].data.sort, dps, params)
searchHandler.handlePathNavData(result[1].data, params, 'new', channel), {
leftContent: searchHandler.handleSortData(result[1].data, dps, params)
});
}
... ... @@ -326,7 +326,7 @@ const getBrandData = (params, extra, channel) => {
}
Object.assign(finalResult.brand, {
leftContent: searchHandler.handleSortData(result[1].data.sort, dps, params)
leftContent: searchHandler.handleSortData(result[1].data, dps, params)
}, searchHandler.handlePathNavData(extra, params, 'brand', channel));
}
... ... @@ -703,7 +703,7 @@ const getShopData = (shopId, channel, params, shopInfo) => {
}
if (subRes[1].code === 200) {
let groupSort = _.get(subRes[1], 'data.sort', []);
let groupSort = _.get(subRes[1], 'data', []);
finalResult.leftContent = searchHandler.handleSortData(groupSort, params, params, '/product/shoplist');
... ... @@ -774,7 +774,7 @@ const getShopGoodsData = (shopId, channel, params) => {
}
if (result[1].code === 200) {
let groupSort = _.get(result[1], 'data.sort', []);
let groupSort = _.get(result[1], 'data', []);
Object.assign(resData, searchHandler.setShopSort(groupSort, Object.assign({}, params,
{page: 1})), searchHandler.setGenderFilter(params));
... ... @@ -884,10 +884,10 @@ const getShopListData = (channel, params, uid) => {
if (result[4].code === 200) {
let groupSort = _.get(result[4], 'data.sort', []),
let groupSort = _.get(result[4], 'data', []),
noPageQs = Object.assign({}, params, {page: 1});
finalResult.leftContent = searchHandler.handleSortData(groupSort, noPageQs);
finalResult.leftContent = searchHandler.handleSortData(groupSort, noPageQs, params);
_.set(finalResult, 'brandShopAd', {baseUrl: shopListUrl});
... ...
... ... @@ -564,10 +564,7 @@ exports.getSaleSpecialData = (id, params, channel) => {
if (!_.isEmpty(result[1])) {
resData.leftContent = searchHandler.handleSortData(_.get(result[1],
'data.sort', []), Object.assign({
msort: params.msort || '',
misort: params.misort || ''
}, defaultParam));
'data', []), defaultParam, params);
}
if (!_.isEmpty(result[2])) {
... ...
... ... @@ -129,9 +129,9 @@ const getSortListOrig = (finalParams) => api.get('', finalParams, config.apiCach
* 获取分类列表
* @return
*/
const getSortList = (params) => {
const getSortList = (params, channel) => {
let finalParams = {
method: 'web.regular.groupsort',
method: 'web.regular.groupsort.sale',
sales: 'Y', // 在销售商品分类
status: 1, // 上架商品分类
stocknumber: 1 // 过滤掉已售罄
... ... @@ -139,6 +139,25 @@ const getSortList = (params) => {
Object.assign(finalParams, params);
if (channel) {
switch (channel) {
case 'boys':
finalParams.yh_channel = 1;
break;
case 'girls':
finalParams.yh_channel = 2;
break;
case 'kids':
finalParams.yh_channel = 3;
break;
case 'lifestyle':
finalParams.yh_channel = 4;
break;
default:
break;
}
}
if (!config.useCache) {
return getSortListOrig(finalParams);
} else {
... ...
... ... @@ -506,70 +506,65 @@ exports.handleSortData = (origin, params, originParams, baseUrl) => {
baseUrl = baseUrl || '';
leftContent.allSort = {};
leftContent.allSort.all = [{
let all = [{
name: '全部品类',
num: allCount,
href: `${baseUrl}${handleFilterUrl(params, {}, {msort: true, misort: true})}`
href: `${baseUrl}${handleFilterUrl(params, {}, {msort: true, misort: true, sort: true, category_id: true})}`
}];
originParams = originParams || {};
_.forEach(origin, value => {
let equalCategory = `${originParams.category_id}` === `${value.category_id}`;
let category = {
name: value.sort_name,
num: value.count,
categoryId: value.category_id,
name: value.category_name,
num: value.node_count,
childList: [
{
name: `全部${value.sort_name}`,
num: value.count,
href: `${baseUrl}${handleFilterUrl(params, {msort: value.sort_id}, {misort: true})}`,
childActive: (params.msort === value.sort_id) && !params.misort,
sortId: value.sort_id
categoryId: value.category_id,
name: `全部${value.category_name}`,
num: value.node_count,
href: `${baseUrl}${handleFilterUrl(params, {category_id: value.category_id}, {
msort: true,
misort: true,
sort: true
})}`,
childActive: equalCategory
}
],
href: `${baseUrl}${handleFilterUrl(params, {msort: value.sort_id}, {misort: true})}`,
active: params.msort === value.sort_id,
sortId: value.sort_id
]
};
allCount += parseInt(value.count, 10);
allCount += parseInt(value.node_count, 10);
_.forEach(value.sub, subValue => {
category.childList.push({
name: subValue.sort_name,
num: subValue.count,
href: `${baseUrl}${handleFilterUrl(params, {msort: value.sort_id, misort: subValue.sort_id})}`,
childActive: params.misort === subValue.sort_id,
sortId: subValue.sort_id
});
if (params.misort === subValue.sort_id) {
category.active = true;
}
if (subValue.sort_id === params.misort && subValue.sub && subValue.sub.length > 2) {
_.forEach(subValue.sub, smallSort => {
if (equalCategory) {
category.active = true;
}
leftContent.sort.misort.push({
id: smallSort.sort_id,
name: smallSort.sort_name,
checked: smallSort.sort_id === _.get(originParams, 'sort'),
href: handleFilterUrl(originParams, {sort: smallSort.sort_id})
});
_.forEach(value.sub, subValue => {
let child = {
categoryId: subValue.category_id,
name: subValue.category_name,
num: subValue.node_count,
href: `${baseUrl}${handleFilterUrl(params, {category_id: subValue.category_id}, {
msort: true,
misort: true,
sort: true
})}`,
childActive: `${originParams.category_id}` === `${subValue.category_id}`
};
if (smallSort.sort_id === _.get(originParams, 'sort')) {
leftContent.checked.push({
name: smallSort.sort_name,
href: handleFilterUrl(originParams, {sort: ''})
});
}
category.childList.push(child);
});
if (child.childActive) {
category.active = true;
}
});
list.push(category);
});
leftContent.allSort.list = list;
leftContent.allSort = {all: all, list: list};
return leftContent;
};
... ... @@ -588,9 +583,9 @@ exports.setShopSort = (data, params) => {
_.forEach(data, value => {
_.forEach(value.sub, subValue => {
list.push({
name: subValue.sort_name,
href: handleFilterUrl(params, {msort: value.sort_id, misort: subValue.sort_id}),
curMenu: params.misort === subValue.sort_id
name: subValue.category_name,
href: handleFilterUrl(params, {category_id: subValue.category_id}),
curMenu: `${params.category_id}` === `${subValue.category_id}`
});
});
});
... ... @@ -1052,26 +1047,36 @@ exports.handlePathNavData = (data, params, page, channel) => {
break;
default :
// 分类
_.forEach(data, (sort) => {
if (sort.sort_id === params.msort) {
pathNav.push({
name: sort.sort_name,
href: '?msort=' + sort.sort_id,
pathTitle: sort.sort_name
});
_.forEach(data, sort => {
let navList = [];
if (`${params.category_id}` === `${sort.category_id}`) {
navList = [{
name: sort.category_name,
pathTitle: sort.category_name
}];
}
if (!_.isEmpty(sort.sub)) {
_.forEach(sort.sub, misort => {
if (misort.sort_id === params.misort) {
pathNav.push({
name: misort.sort_name,
pathTitle: misort.sort_name
});
if (`${params.category_id}` === `${misort.category_id}`) {
navList = [{
name: sort.category_name,
href: handleFilterUrl(sort.relation_parameter),
pathTitle: sort.category_name
},
{
name: misort.category_name,
pathTitle: misort.category_name
}];
}
});
}
if (!_.isEmpty(navList)) {
pathNav = _.concat(pathNav, navList);
}
});
break;
}
... ... @@ -1427,7 +1432,7 @@ exports.getListSeo = (channel, sorts, checked) => {
if (val.active) {
kd.sort = val && val.name;
_.forEach(val.childList, sub => {
if (sub.childActive && sub.sortId !== val.sortId) {
if (sub.childActive && sub.categoryId !== val.categoryId) {
kd.sort = sub && sub.name;
}
});
... ... @@ -1436,7 +1441,11 @@ exports.getListSeo = (channel, sorts, checked) => {
checked = checked || [];
_.forEach(checked, ck => {
switch (ck.itemType) {
if (!(ck && ck.itemType)) {
return false;
}
switch (ck && ck.itemType) {
case 'brand':
case 'color':
case 'size':
... ... @@ -1650,6 +1659,15 @@ exports.getSearchParams = params => {
nparams.price = nmp.join(',');
}
// 未登录状态uid传个性化推荐id（即上次登录cookie中存储的_PRID）
if (_.has(params, 'prid')) {
if (!params.uid && params.prid) {
nparams.uid = params.prid;
}
_.unset(params, 'prid');
}
// 商品详情页促销跳转
if (params && params.psp_id) {
Object.assign(nparams, {
... ... @@ -1659,9 +1677,10 @@ exports.getSearchParams = params => {
}
// 优惠券商品列表
if (params && params.cpc_id) {
if (params && params.cpc_id && params.coupon_code) {
Object.assign(nparams, {
coupon_id: params.cpc_id,
coupon_code: params.coupon_code,
method: 'app.search.coupon'
});
}
... ...
... ... @@ -44,7 +44,7 @@ const setSearchData = (result, params, channel) => {
});
finalResult.search = {
leftContent: searchHandler.handleSortData(result[1].data.sort, dps, params),
leftContent: searchHandler.handleSortData(result[1].data, dps, params),
isSearch: true
};
}
... ... @@ -61,7 +61,7 @@ const setSearchData = (result, params, channel) => {
}
let filters = Object.assign(searchHandler.handleFilterDataAll(result[2].data, changeQuery),
finalResult.search.leftContent.sort);
_.get(finalResult, 'search.leftContent.sort', {}));
filters.checkedConditions.conditions = _.concat(filters.checkedConditions.conditions,
finalResult.search.leftContent.checked);
... ... @@ -233,9 +233,10 @@ exports.getBrands4Filter = (params) => {
}
// 优惠券商品列表
if (params && params.cpc_id) {
if (params && params.cpc_id && params.coupon_code) {
Object.assign(nparams, {
coupon_id: params.cpc_id,
coupon_code: params.coupon_code,
method: 'app.coupon.aggBrand'
});
}
... ...