Authored by 刘传洋

yoho币

... ... @@ -21,7 +21,7 @@ const homeNav = [
subNav: [
{name: '我的订单', href: helpers.urlFormat('/home/orders'), active: true},
{name: '我的收藏', href: helpers.urlFormat('/home/favorite')},
{name: '我的YOHO币', href: helpers.urlFormat('/home/currency')},
{name: '我的有货币', href: helpers.urlFormat('/home/currency')},
{name: '我的红包', href: helpers.urlFormat('/home/redenvelopes')},
{name: '我的优惠券', href: helpers.urlFormat('/home/coupons')},
{name: '我的VIP', href: helpers.urlFormat('/home/vip')}
... ... @@ -51,14 +51,15 @@ const homeNav = [
const getHomeNav = (req, res, next) => {
res.locals.homeNav = homeNav;
res.locals.userThumb = '//img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100';
res.locals.userThumb = '//img10.static.yhbimg.com/headimg/2013/11/28/09/' +
'01cae078abe5fe320c88cdf4c220212688.gif?imageView/2/w/100/h/100';
next();
};
const getCommonHeader = (req, res, next) => {
let channel = req.query.channel ? req.query.channel : 'boys';
headerModel.requestHeaderData(channel).then((result)=>{
_.merge(res.locals,result);
_.merge(res.locals, result);
next();
});
};
... ... @@ -77,11 +78,11 @@ const sessionEffective = (req, res, next) => {
}
res.redirect(helpers.urlFormat('/signin.html', {
refer: refer
}));
refer: refer
}));
};
// 查看二维码
router.get('/QRcode',sessionEffective,[getHomeNav,getCommonHeader],personalController.QRcode);
router.get('/QRcode', sessionEffective, [getHomeNav, getCommonHeader], personalController.QRcode);
module.exports = router;
... ...
... ... @@ -596,9 +596,9 @@ const _detailDataPkg = (origin, uid, vipLevel) => {
}
const C_VALUE = {
type: '返YOHO币',
type: '返有货币',
des: '每件返 ',
rest: '个 YOHO币'
rest: '个 有货币'
};
if (_.get(origin, 'productPriceBo.yohoCoinNum', 0)) {
... ...
... ... @@ -226,7 +226,7 @@
<span>会员中心</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=87" target="_blank">YOHO</a>
<a href="//www.yohobuy.com/help/?category_id=87" target="_blank">有货</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=91" target="_blank">会员制度</a>
... ... @@ -269,7 +269,7 @@
<a href="//www.yohobuy.com/help/?category_id=109" target="_blank">优惠券</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=111" target="_blank">YOHO币支付</a>
<a href="//www.yohobuy.com/help/?category_id=111" target="_blank">有货币支付</a>
</p>
</li>
<li class="left">
... ...
... ... @@ -186,7 +186,7 @@
<span class="right">\{{coupon}}</span>
</li>
<li>
<a href="//www.yohobuy.com/home/currency?t=\{{timestamp}}">我的YOHO币</a>
<a href="//www.yohobuy.com/home/currency?t=\{{timestamp}}">我的有货币</a>
<span class="right">\{{coin}}</span>
</li>
<li>
... ...