fe / yohobuy-node · Commits

Go to a project

Authored by 陈峰
Commit e899016be509fa03394137de3f1e8191b677a80d 2 parents f8d916c4 c9df48ba

Merge branch 'release/6.5' into 'gray' 

fix router regist



See merge request !222
Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
@@ -63,8 +63,8 @@ router.get('/sale/breakingYards', sale.breakingYards); // 断码区 @@ -63,8 +63,8 @@ router.get('/sale/breakingYards', sale.breakingYards); // 断码区
63 router.get('/sale/breakingYards/:pathQs', paramParse, sale.breakingYards); // 断码区 带伪静态参数 63 router.get('/sale/breakingYards/:pathQs', paramParse, sale.breakingYards); // 断码区 带伪静态参数
64 router.get('/sale/newSale', sale.newSale); // 最新降价 64 router.get('/sale/newSale', sale.newSale); // 最新降价
65 router.get('/sale/newSale/:pathQs', paramParse, sale.newSale); // 最新降价 带伪静态参数 65 router.get('/sale/newSale/:pathQs', paramParse, sale.newSale); // 最新降价 带伪静态参数
66 -router.get('/sale/special', sale.special); // sale活动页 原PHP sale.yohobuy.com  
67 -router.get('/sale/special/:pathQs', paramParse, sale.special); // sale活动页 原PHP sale.yohobuy.com 66 +router.get('/sale/special', '/sale/special', sale.special); // sale活动页 原PHP sale.yohobuy.com
  67 +router.get('/sale/special/:pathQs', '/sale/special/:pathQs', paramParse, sale.special); // sale活动页 原PHP sale.yohobuy.com
68 router.get('/sale/goods', sale.getGoodsList); // ajax 获取商品列表 68 router.get('/sale/goods', sale.getGoodsList); // ajax 获取商品列表
69 69
70 // 奥特莱斯routers 70 // 奥特莱斯routers
@@ -101,8 +101,8 @@ router.post('/detail/notify/add', auth, notify.add); // 增 @@ -101,8 +101,8 @@ router.post('/detail/notify/add', auth, notify.add); // 增
101 router.post('/detail/notify/cancel', auth, notify.cancel); // 删除到货通知 101 router.post('/detail/notify/cancel', auth, notify.cancel); // 删除到货通知
102 102
103 // 全球购routers 103 // 全球购routers
104 -router.get('/list/global', globalCtrl.list); // 全球购列表页  
105 -router.get('/list/global/:pathQs', paramParse, globalCtrl.list); // 全球购列表页 104 +router.get('/list/global', '/list/global', globalCtrl.list); // 全球购列表页
  105 +router.get('/list/global/:pathQs','/list/global/:pathQs', paramParse, globalCtrl.list); // 全球购列表页
106 router.get('/global/list', globalCtrl.list); // 全球购列表页 【老路由，待删】 106 router.get('/global/list', globalCtrl.list); // 全球购列表页 【老路由，待删】
107 router.get('/global/detail', globalCtrl.detail); 107 router.get('/global/detail', globalCtrl.detail);
108 router.get(/\/global\/([\d]+)(.*)/, globalCtrl.detail); 108 router.get(/\/global\/([\d]+)(.*)/, globalCtrl.detail);