router-adjust

@@ -9,9 +9,8 @@
 const router = require('express').Router(); // eslint-disable-line
 
 const auth = require('../../doraemon/middleware/auth');
-
 const rewrite = require('../../doraemon/middleware/rewrite');
-
+const cors = require('../../doraemon/middleware/cors');
 const cRoot = './controllers';
 
 // 商品详情controller
@@ -117,107 +116,84 @@ router.get(/^\/(.*?)-sale\/vip/, rewrite.resolve, sale.vip);
 router.get(/^\/(.*?)-sale/, rewrite.resolve, sale.index);
 
 router.get('/sale/discount', sale.discount);
-
 router.get('/sale/discount/detail', sale.discountDetail);
 router.get('/sale/breakingYards', sale.breakingYards);
-
 router.get('/sale/vip', sale.vip);
 router.get('/sale/discount/getTime', sale.getTime);
-
 router.get('/sale/search', rewrite.resolvePathParamsAjax, sale.search);
 router.get('/sale/filter', sale.filter);
 
 router.get('/outlet', outlet.index);
 router.get('/outlet/activity', outlet.activityDetail);
 router.get('/outlet/activityTime', outlet.activityTime);
-
 router.get('/outlet/activityinfo', outlet.activityList);
 
 router.get('/recommend-for-you/userCenter', recommendForYou.userCenter);
 router.get('/recommend-for-you/cart', recommendForYou.cart);
 
-
 router.get('/seckill', seckill.index); // 秒杀列表页
 router.get('/seckill/list', seckill.indexData);
-
 router.post('/seckill/remind', seckill.remind); // only app; 秒杀提醒
 router.get('/seckill/get-product-list', seckill.getProductList); // 秒杀列表根据活动id获取商品列表
 
-// 搜索主页
-router.get('/search/index', search.index);
-
-// 推广落地页
-router.get('/search/so/:query.html', rewrite.sortParams, chanpin.keyword);
+router.get('/search/index', search.index); // 搜索主页
+router.get('/search/so/:query.html', rewrite.sortParams, chanpin.keyword); // 推广落地页
 router.get('/search/chanpin/:id.html', rewrite.sortParams, chanpin.keyId);
 router.get('/search/chanpin/goods', chanpin.searchGoods); // 搜索的商品
-
-// 搜索落地页
-router.get('/search/list', rewrite.sortParams, search.list);
-
-// filter
-router.get('/search/filter', search.filter);
-
-// fuzzyDatas
-router.get('/search/fuzzyDatas', search.fuzzyDatas);
-
+router.get('/search/list', rewrite.sortParams, search.list); // 搜索落地页
+router.get('/search/filter', search.filter); // filter
+router.get('/search/fuzzyDatas', search.fuzzyDatas); // fuzzyDatas
 router.get('/search/search', search.search); // ajax 请求商品数据
 router.get('/search/brand/goods', search.searchBrandGoods); // 搜索品牌下的商品
 router.get('/search/shop/goods', search.searchShopGoods); // 搜索店铺下的商品
 
-// 全球购路由重写
-router.get('/list/global(/*)?', rewrite.resolvePathParams, globalPro.list); // 全球购列表页
-
-// 品类
-router.get('/index/index', rewrite.sortParams, list.category);
+router.get('/list/global(/*)?', rewrite.resolvePathParams, globalPro.list); // 全球购路由重写 全球购列表页
+router.get('/index/index', rewrite.sortParams, list.category); // 旧品类首页
 router.get('/list/index', rewrite.sortParams, list.category); // 兼容 PC 的链接
 router.get('/list(/*)?', rewrite.resolvePathParams, list.listNew); // 列表新的 URL
-router.get('/search/category', rewrite.resolvePathParamsAjax, list.getCategoryGoods);
+router.get('/search/category',
+    cors,
+    rewrite.resolvePathParamsAjax,
+    list.getCategoryGoods);
 
 // 品牌 | 店铺
 router.get('/index/shopAppCookie', list.shopAppCookie);
 router.get('/index/shopFav', list.shopFav);
-
 router.get('/index/category', list.shopCategory);
 router.get('/index/getBrandCouponsList', list.getBrandCouponsList);
 
-// 店铺重构
 router.get('/shop', newShop.redirect); // 老路由重定向前置处理
 router.get('/shop/:domain-:shop_id.html', newShop.resolveParams); // 新入口
-router.get('/shop/:domain-:shop_id/*', list.listNew); // 店铺列表路由
+router.get('/shop/:domain-:shop_id/*', rewrite.resolvePathParams, newShop.goodsList); // 店铺商品列表
+router.get('/shop/goodslist',
+    cors,
+    rewrite.resolvePathParamsAjax,
+    newShop.goodsListAjax); // 店铺商品列表异步查询
 
 router.get('/index/brand', newShop.entry); // 旧的路由，走到新的 controller
 router.get('/index/brandFav', newShop.brandFav);
 router.get('/new/shop/hotlist', newShop.shopHotList);
 router.get('/index/getShopCouponsList', newShop.getShopCouponsList);
 router.post('/index/userCoupon', newShop.userCoupon);
-
-router.get('/red-shop', newShop.redShop);
-
-// end- 店铺重构
-
-// 店铺介绍
-router.get('/index/intro', list.shopIntro);
-
-// 品牌|店铺收藏|取消收藏
-router.get('/opt/favoriteBrand', list.favoriteBrand);
+router.get('/red-shop', newShop.redShop); // 红人店铺
+router.get('/index/intro', list.shopIntro); // 店铺介绍
+router.get('/opt/favoriteBrand', list.favoriteBrand); // 品牌|店铺收藏|取消收藏
+router.get('/index/allBrand', newShop.allBrand); // 店铺全部品牌
 
 // 新品到着
 router.get('/new', rewrite.channel, news.newGoodsRedirect);
 
 // 新品到着 SEO优化
 router.get(/^\/(.*?)-new/, rewrite.resolve, rewrite.resolvePathParams, news.newGoods);
-
 router.get('/list/new', news.newGoods); // 兼容 PC 的链接
 router.get('/new/selectNewSale', rewrite.resolvePathParamsAjax, news.selectNewSale);
 router.get('/new/filter', rewrite.resolvePathParamsAjax, news.filter);
-
 router.get('/newnew', news._newGoods); // TODO: repleace /new
 router.get('/new/recommend-shop.json', news.recommendShop);
 router.get('/new/goods.json', news.fetchNew);
 router.get('/new/goods-filter', news.goodsFilter);
 router.get('/new/shops', news.brands);
 
-
 // 新品到着(blk)
 router.get('/blknew', news.blkNewGoods);
 
@@ -230,8 +206,6 @@ router.post('/bundle/cart/add', bundle.addToCart); // 套装加入购物车
 router.post('/opt/favoriteProduct', newDetail.favoriteProduct); // 商品收藏、取消收藏
 router.get('/detail/limitHelp', newDetail.limitHelp);
 
-router.get('/index/allBrand', newShop.allBrand); // 店铺全部品牌
-
 router.get('/global/list', globalPro.list); // 全球购列表页
 router.get('/global/search', rewrite.resolvePathParamsAjax, globalPro.search); // 全球购列表页搜索数据
 router.get(/^\/global\/(\d+)\.html/, globalPro.detail); // 全球购店铺详情页