Authored by ccbikai(👎🏻🍜)

Merge remote-tracking branch 'origin/feature/featureTemplate' into gray

@@ -227,7 +227,7 @@ router.get('/redbag/2017', redbag.index); @@ -227,7 +227,7 @@ router.get('/redbag/2017', redbag.index);
227 router.get('/individuation', individuation.productLst); 227 router.get('/individuation', individuation.productLst);
228 228
229 // 活动页模版 229 // 活动页模版
230 -router.get('/feature/:code', feature.index); 230 +router.get('/feature/:code.html', feature.index);
231 231
232 // 2016 年度账单 232 // 2016 年度账单
233 router.get('/annual-account', annualAccount.index); 233 router.get('/annual-account', annualAccount.index);
@@ -34,6 +34,9 @@ module.exports = () => { @@ -34,6 +34,9 @@ module.exports = () => {
34 34
35 if (req.hostname === 'activity.yoho.cn') { 35 if (req.hostname === 'activity.yoho.cn') {
36 // 活动模版的活动页 36 // 活动模版的活动页
  37 + if (req.path === '/') {
  38 + return res.redirect('//m.yohobuy.com');
  39 + }
37 req.url = `/activity${req.url}`; 40 req.url = `/activity${req.url}`;
38 } else if (req.subdomains.length) { 41 } else if (req.subdomains.length) {
39 switch (req.subdomains[0]) { 42 switch (req.subdomains[0]) {