Merge branches 'feature/redpack' and 'release/6.7.9' of http://git.yoho.cn/fe/yo…

…hobuywap-node into feature/redpack

# Conflicts:
#	apps/activity/router.js

@@ -278,6 +278,7 @@ router.get('/feature/couponSend', feature.couponSend); // 获取优惠券
 router.get('/tide/category', auth, tide.category); // 潮品推介
 router.get('/tide/category', auth, tide.category); // 潮品推介
 router.get('/tide/shop', auth, tide.shop); // 潮牌推介
 router.get('/tide/shop', auth, tide.shop); // 潮牌推介
 router.get('/feature/redenvelope', feature.redenvelope); // 获取红包
 router.get('/feature/redenvelope', feature.redenvelope); // 获取红包
+router.get('/feature/goods', feature.goods);
 
 
 // 2016 年度账单
 // 2016 年度账单
 router.get('/annual-account', annualAccount.index);
 router.get('/annual-account', annualAccount.index);

@@ -58,7 +58,7 @@ exports.index = async(req, res, next) => {
             shareUrl = '/activity/red-envelope/index?shareCode=' + shareCode.data;
             shareUrl = '/activity/red-envelope/index?shareCode=' + shareCode.data;
         }
         }
         let result = await req.ctx(newHomeModel).index(params);
         let result = await req.ctx(newHomeModel).index(params);
-        let recommendHide = await _.get(req.app.locals.wap, 'ucenter.removePrefer', false);
+        let recommendHide = _.get(req.app.locals.wap, 'ucenter.removePrefer', false);
 
 
         responseData.isWxcs = isWxcs;
         responseData.isWxcs = isWxcs;
         responseData.shareUrl = shareUrl;
         responseData.shareUrl = shareUrl;