fe / yohobuy-node · Commits

Go to a project

Authored by 周少峰
Commit b1e1c8c25d6a64e8d7e735d2903bdeb1a32ff508 2 parents 8fcb4fa6 03e44e57

Merge branch 'release/5.4' into gray

Inline Side-by-side
Showing 7 changed files with 59 additions and 44 deletions
... ... @@ -263,7 +263,7 @@
</div>
<ul id="balance-detail" class="balance-detail right">
<li class="gain-coin">
<a class="gain-coin-tip" href="/help/?category_id=87" target="_blank"></a>
<a class="gain-coin-tip" href="/help/detail?id=105" target="_blank"></a>
共返YOHO币：{{gain_yoho_coin}}个
</li>
{{#each promotion_formula_list}}
... ... @@ -326,7 +326,7 @@
<p class="btns">
<span id="coin-sure" class="coin-sure sure-btn">确定</span>
<span id="coin-cancel" class="coin-cancel cancel-btn">取消</span>
<a href="/help/?category_id=87" class="coin-help" target="_blank">有货币使用规则?</a>
<a href="/help/detail?id=105" class="coin-help" target="_blank">有货币使用规则?</a>
</p>
</div>
<input id="coin-used" type="hidden" data-coin="{{usedCoinNum}}" data-max={{canUseCoinNum}}>
... ...
... ... @@ -40,7 +40,7 @@ const currencyData = (uid, condition)=>{
let currency = yield currencyList(uid, condition);
result.currency = currency.list;
result.pager = currency.pager;
result.coinHelperUrl = '//www.yohobuy.com/help/?category_id=87';// yoho币帮助
result.coinHelperUrl = '//www.yohobuy.com/help/detail?id=105';// yoho币帮助
result.tabs = currencyTabs(condition.queryType);
result.options = currencyOptions(condition);
return result;
... ...
... ... @@ -230,7 +230,7 @@
</table>
<div class="order-balance">
<p class="back-coin">
<a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a>共返YOHO币：{{totalYoho}}个
<a href="/help/detail?id=105" class="yoho-coin" target="_blank"></a>共返YOHO币：{{totalYoho}}个
</p>
{{#each orderBalance}}
<p>
... ...
... ... @@ -85,7 +85,7 @@ let index = (req, res, next) => {
location: area || '+86',
defaultMobile: mobile,
captchaUrl: helpers.urlFormat('/passport/imagesNode', {t: Date.now()}),
itemUrl: helpers.urlFormat('/help/', {category_id: 143}),
itemUrl: helpers.urlFormat('/help/detail', {id: 103, contId: 197}),
referUrl: refer,
loginUrl: helpers.urlFormat('/signin.html', {refer: refer}),
coverHref: result.url,
... ...
... ... @@ -153,14 +153,19 @@ const index = (req) => {
yh_channel: channelMap[channel].yh_channel,
uid: req.user.uid || ''
};
let shopParams = Object.assign({}, params, {contentCode: channelMap[channel].code});
let recParams = Object.assign({}, params);
let recParams = Object.assign({}, params, {
sort: req.query.sort || '',
page: req.query.page || 1
});
let apiMethod = [
headerModel.requestHeaderData(channel),
api.recShop(shopParams),
api.recBrand(params),
api.recList(recParams)
api.recList(Object.assign({}, params)),//获取品类
api.recList(recParams)//获取商品数据
];
return Promise.all(apiMethod).then(result => {
... ... @@ -253,22 +258,32 @@ const index = (req) => {
// 推荐品类
_.forEach(groupSort, group =>{
_.forEach(group.sub, subSort =>{
let cateObj = {
cateId: subSort.category_id,
url: publicHandler.handleFilterUrl(params, {sort: subSort.relation_parameter.sort}),
name: subSort.category_name,
active: false
};
if (ctyList.length < 20) {
ctyList.push({
cateId: subSort.category_id,
url: publicHandler.handleFilterUrl(params, {sort: subSort.relation_parameter.sort}),
name: subSort.category_name
});
//默认选中判断
if (req.query.sort === subSort.relation_parameter.sort) {
cateObj.active = true;
}
ctyList.push(cateObj);
} else {
return true;
}
});
});
Object.assign(respData.newProduct.ctyList, ctyList);
}
// 最新上架
if (result[4].code === 200 && result[4].data) {
// 列表数据
Object.assign(respData.newProduct, _proListHandler(result[3].data,
Object.assign({}, recParams, {channel: channel})));
Object.assign(respData.newProduct, _proListHandler(result[4].data,
Object.assign({}, recParams, {channel: channel})));
}
// 数据为空，不显示页面模块
... ...
... ... @@ -94,7 +94,7 @@
签收商品未经穿着不影响二次销售的情况下，7日内退货，15日内换货；
退回商品保证吊牌、标签、包装完整，详情点击
<br />
<a href="http://www.yohobuy.com/help/?category_id=69"
<a href="http://www.yohobuy.com/help/detail?id=49"
target="_blank">&gt;&gt;退换货政策</a>
</span>
</span>
... ...
... ... @@ -206,19 +206,19 @@
<ul class="clearfix">
<li class="left">
<p>
<span>新手指南</span>
<span>新手专区</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=81#help_b00reg" target="_blank">注册登录</a>
<a href="//www.yohobuy.com/help/detail?id=25" target="_blank">注册登录</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=83" target="_blank">选购商品</a>
<a href="//www.yohobuy.com/help/detail?id=27" target="_blank">购物结算</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=103" target="_blank">订单支付</a>
<a href="//www.yohobuy.com/help/detail?id=29" target="_blank">下单支付</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=85" target="_blank">收货退款</a>
<a href="//www.yohobuy.com/help/detail?id=31" target="_blank">收货评价</a>
</p>
</li>
<li class="left">
... ... @@ -226,16 +226,16 @@
<span>会员中心</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=87" target="_blank">有货币</a>
<a href="//www.yohobuy.com/help/detail?id=7" target="_blank">会员制度</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=91" target="_blank">会员制度</a>
<a href="//www.yohobuy.com/help/detail?id=9" target="_blank">会员优惠</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=89" target="_blank">账户管理</a>
<a href="//www.yohobuy.com/help/detail?id=11" target="_blank">账户管理</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=93" target="_blank">密码管理</a>
<a href="//www.yohobuy.com/help/detail?id=13" target="_blank">密码管理</a>
</p>
</li>
<li class="left">
... ... @@ -243,16 +243,16 @@
<span>购物指南</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=95" target="_blank">全球购专区</a>
<a href="//www.yohobuy.com/help/detail?id=33" target="_blank">发票</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=97" target="_blank">尺码选择</a>
<a href="//www.yohobuy.com/help/detail?id=35" target="_blank">尺码对照</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=99" target="_blank">发票</a>
<a href="//www.yohobuy.com/help/detail?id=37" target="_blank">尺码解读</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=101" target="_blank">商品咨询</a>
<a href="//www.yohobuy.com/help/detail?id=39" target="_blank">商品咨询</a>
</p>
</li>
<li class="left">
... ... @@ -260,16 +260,16 @@
<span>支付方式</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=105" target="_blank">在线支付</a>
<a href="//www.yohobuy.com/help/detail?id=43" target="_blank">在线支付</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=107" target="_blank">货到付款</a>
<a href="//www.yohobuy.com/help/detail?id=45" target="_blank">货到付款</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=109" target="_blank">优惠券</a>
<a href="//www.yohobuy.com/help/detail?id=47" target="_blank">分期支付</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=111" target="_blank">有货币支付</a>
<a href="//www.yohobuy.com/help/detail?id=105" target="_blank">优惠券、有货币</a>
</p>
</li>
<li class="left">
... ... @@ -277,16 +277,16 @@
<span>配送方式</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=113" target="_blank">配送时间</a>
<a href="//www.yohobuy.com/help/detail?id=109" target="_blank">配送说明</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=115" target="_blank">配送范围</a>
<a href="//www.yohobuy.com/help/detail?id=111" target="_blank">运费说明</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=119" target="_blank">顺丰速运</a>
<a href="//www.yohobuy.com/help/detail?id=113" target="_blank">验货签收</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=117" target="_blank">商品验收与签收</a>
<a href="//www.yohobuy.com/help/detail?id=115" target="_blank">收货样品</a>
</p>
</li>
<li class="left">
... ... @@ -294,16 +294,16 @@
<span>售后服务</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=121" target="_blank">退换货政策</a>
<a href="//www.yohobuy.com/help/detail?id=49" target="_blank">退换货政策</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=123" target="_blank">退换货流程</a>
<a href="//www.yohobuy.com/help/detail?id=51" target="_blank">退换货流程</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=125" target="_blank">退款方式与时效</a>
<a href="//www.yohobuy.com/help/detail?id=53" target="_blank">时效承诺</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=127" target="_blank">投诉与建议</a>
<a href="//www.yohobuy.com/help/detail?id=55" target="_blank">投诉与建议</a>
</p>
</li>
<li class="left">
... ... @@ -311,16 +311,16 @@
<span>APP常见问题</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=133" target="_blank">IPhone版</a>
<a href="//www.yohobuy.com/help/detail?id=57" target="_blank">IPhone版</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=135" target="_blank">Android版</a>
<a href="//www.yohobuy.com/help/detail?id=59" target="_blank">Android版</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=137" target="_blank">wap版</a>
<a href="//www.yohobuy.com/help/detail?id=61" target="_blank">wap版</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=139" target="_blank">IPAD版</a>
<a href="//www.yohobuy.com/help/detail?id=63" target="_blank">IPAD版</a>
</p>
</li>
</ul>
... ...