router-params

@@ -167,13 +167,22 @@ router.get('/index/shopFav', list.shopFav);
 router.get('/index/category', list.shopCategory);
 router.get('/index/category', list.shopCategory);
 router.get('/index/getBrandCouponsList', list.getBrandCouponsList);
 router.get('/index/getBrandCouponsList', list.getBrandCouponsList);
 
 
-router.get('/shop', newShop.redirect); // 老路由重定向前置处理
-router.get('/shop/:domain-:shop_id.html', newShop.entry); // 新入口
-router.get('/shop/:domain-(:shop_id)(/:pathParams)?', rewrite.resolvePathParams, newShop.goodsList); // 店铺商品列表
 router.get('/shop/goodslist',
 router.get('/shop/goodslist',
     cors,
     cors,
     rewrite.resolveShopPathParamsAjax,
     rewrite.resolveShopPathParamsAjax,
     newShop.goodsListAjax); // 店铺商品列表异步查询
     newShop.goodsListAjax); // 店铺商品列表异步查询
+router.get('/shop/:shopParams.html',
+    newShop.resolveShopParams,
+    newShop.entry); // 新入口
+router.get('/shop/:shopParams',
+    rewrite.resolvePathParams,
+    newShop.resolveShopParams,
+    newShop.goodsList); // 店铺商品列表
+router.get('/shop/:shopParams/:pathParams',
+    rewrite.resolvePathParams,
+    newShop.resolveShopParams,
+    newShop.goodsList); // 店铺商品列表
+router.get('/shop', newShop.redirect); // 老路由重定向前置处理
 
 
 router.get('/index/brand', newShop.entry); // 旧的路由，走到新的 controller
 router.get('/index/brand', newShop.entry); // 旧的路由，走到新的 controller
 router.get('/index/brandFav', newShop.brandFav);
 router.get('/index/brandFav', newShop.brandFav);