all-support-path-params
Showing
5 changed files
with
11 additions
and
7 deletions
@@ -209,7 +209,7 @@ router.get(/^\/(.*?)-new/, rewrite.resolve, rewrite.resolvePathParams, news.newG | @@ -209,7 +209,7 @@ router.get(/^\/(.*?)-new/, rewrite.resolve, rewrite.resolvePathParams, news.newG | ||
209 | 209 | ||
210 | router.get('/list/new', news.newGoods); // 兼容 PC 的链接 | 210 | router.get('/list/new', news.newGoods); // 兼容 PC 的链接 |
211 | router.get('/new/selectNewSale', rewrite.resolvePathParamsAjax, news.selectNewSale); | 211 | router.get('/new/selectNewSale', rewrite.resolvePathParamsAjax, news.selectNewSale); |
212 | -router.get('/new/filter', news.filter); | 212 | +router.get('/new/filter', rewrite.resolvePathParamsAjax, news.filter); |
213 | 213 | ||
214 | router.get('/newnew', news._newGoods); // TODO: repleace /new | 214 | router.get('/newnew', news._newGoods); // TODO: repleace /new |
215 | router.get('/new/recommend-shop.json', news.recommendShop); | 215 | router.get('/new/recommend-shop.json', news.recommendShop); |
@@ -233,7 +233,7 @@ router.get('/detail/limitHelp', newDetail.limitHelp); | @@ -233,7 +233,7 @@ router.get('/detail/limitHelp', newDetail.limitHelp); | ||
233 | router.get('/index/allBrand', newShop.allBrand); // 店铺全部品牌 | 233 | router.get('/index/allBrand', newShop.allBrand); // 店铺全部品牌 |
234 | 234 | ||
235 | router.get('/global/list', globalPro.list); // 全球购列表页 | 235 | router.get('/global/list', globalPro.list); // 全球购列表页 |
236 | -router.get('/global/search', globalPro.search); // 全球购列表页搜索数据 | 236 | +router.get('/global/search', rewrite.resolvePathParamsAjax, globalPro.search); // 全球购列表页搜索数据 |
237 | router.get(/^\/global\/(\d+)\.html/, globalPro.detail); // 全球购店铺详情页 | 237 | router.get(/^\/global\/(\d+)\.html/, globalPro.detail); // 全球购店铺详情页 |
238 | router.get('/global/gethtml', globalPro.gethtml); // 全球购商品信息 | 238 | router.get('/global/gethtml', globalPro.gethtml); // 全球购商品信息 |
239 | 239 |
@@ -84,7 +84,8 @@ function getUrlParam(name) { | @@ -84,7 +84,8 @@ function getUrlParam(name) { | ||
84 | 84 | ||
85 | defaultOpt = $.extend({ | 85 | defaultOpt = $.extend({ |
86 | yh_channel: getUrlParam('channel') || defaultOpt.channel || 'boys', // TODO GO ON! | 86 | yh_channel: getUrlParam('channel') || defaultOpt.channel || 'boys', // TODO GO ON! |
87 | - saleType: 1 | 87 | + saleType: 1, |
88 | + currentUrl: location.pathname | ||
88 | }, defaultOpt); | 89 | }, defaultOpt); |
89 | 90 | ||
90 | storeOpt = $.extend({}, defaultOpt); | 91 | storeOpt = $.extend({}, defaultOpt); |
@@ -224,8 +225,7 @@ function search(opt) { | @@ -224,8 +225,7 @@ function search(opt) { | ||
224 | $.extend(setting, defaultOpt, { | 225 | $.extend(setting, defaultOpt, { |
225 | type: 'stock', | 226 | type: 'stock', |
226 | order: 0, | 227 | order: 0, |
227 | - page: page, | ||
228 | - currentUrl: location.pathname | 228 | + page: page |
229 | }); | 229 | }); |
230 | 230 | ||
231 | searching = true; | 231 | searching = true; |
@@ -103,7 +103,8 @@ class ListController extends Controller { | @@ -103,7 +103,8 @@ class ListController extends Controller { | ||
103 | 103 | ||
104 | let page = this.nav.page + 1; | 104 | let page = this.nav.page + 1; |
105 | let params = $.extend({}, this.query, { | 105 | let params = $.extend({}, this.query, { |
106 | - page: page | 106 | + page: page, |
107 | + currentUrl: location.pathname | ||
107 | }); | 108 | }); |
108 | 109 | ||
109 | this.searching = true; | 110 | this.searching = true; |
@@ -25,6 +25,8 @@ let winH = $(window).height(), | @@ -25,6 +25,8 @@ let winH = $(window).height(), | ||
25 | // 默认筛选条件 | 25 | // 默认筛选条件 |
26 | let defaultOpt = require('common/query-param'); | 26 | let defaultOpt = require('common/query-param'); |
27 | 27 | ||
28 | +defaultOpt.currentUrl = location.pathname; | ||
29 | + | ||
28 | let storeOpt = $.extend({}, defaultOpt); // 存储默认筛选条件以便重置 | 30 | let storeOpt = $.extend({}, defaultOpt); // 存储默认筛选条件以便重置 |
29 | 31 | ||
30 | let now = new Date(), | 32 | let now = new Date(), |
@@ -111,7 +111,8 @@ if ($('.sale-vip-page').length > 0) { | @@ -111,7 +111,8 @@ if ($('.sale-vip-page').length > 0) { | ||
111 | 111 | ||
112 | // 获取频道 | 112 | // 获取频道 |
113 | $.extend(defaultOpt, { | 113 | $.extend(defaultOpt, { |
114 | - yh_channel: getUrlParam('channel') || defaultOpt.channel || 'all' | 114 | + yh_channel: getUrlParam('channel') || defaultOpt.channel || 'all', |
115 | + currentUrl: location.pathname | ||
115 | }); | 116 | }); |
116 | 117 | ||
117 | // 判断导航类型 | 118 | // 判断导航类型 |
-
Please register or login to post a comment