|
@@ -23,6 +23,7 @@ var winH = $(window).height(), |
|
@@ -23,6 +23,7 @@ var winH = $(window).height(), |
23
|
|
23
|
|
24
|
// 默认筛选条件
|
24
|
// 默认筛选条件
|
25
|
var defaultOpt = require('../../common/query-param');
|
25
|
var defaultOpt = require('../../common/query-param');
|
|
|
26
|
+var defaultParams;
|
26
|
|
27
|
|
27
|
var $listNav = $('#list-nav'),
|
28
|
var $listNav = $('#list-nav'),
|
28
|
|
29
|
|
|
@@ -93,7 +94,7 @@ function getUrlParam(name) { |
|
@@ -93,7 +94,7 @@ function getUrlParam(name) { |
93
|
|
94
|
|
94
|
// 获取频道
|
95
|
// 获取频道
|
95
|
$.extend(defaultOpt, {
|
96
|
$.extend(defaultOpt, {
|
96
|
- yh_channel: getUrlParam('channel') || 'boys'
|
97
|
+ yh_channel: getUrlParam('channel') || 'all'
|
97
|
});
|
98
|
});
|
98
|
|
99
|
|
99
|
// 判断导航类型
|
100
|
// 判断导航类型
|
|
@@ -216,12 +217,14 @@ function search(opt, params) { |
|
@@ -216,12 +217,14 @@ function search(opt, params) { |
216
|
}
|
217
|
}
|
217
|
|
218
|
|
218
|
if (params) {
|
219
|
if (params) {
|
|
|
220
|
+ defaultParams = params;
|
219
|
$.extend(setting, params, {
|
221
|
$.extend(setting, params, {
|
220
|
type: navType,
|
222
|
type: navType,
|
221
|
order: nav.order,
|
223
|
order: nav.order,
|
222
|
page: page
|
224
|
page: page
|
223
|
});
|
225
|
});
|
224
|
} else {
|
226
|
} else {
|
|
|
227
|
+ defaultParams = null;
|
225
|
$.extend(setting, defaultOpt, {
|
228
|
$.extend(setting, defaultOpt, {
|
226
|
type: navType,
|
229
|
type: navType,
|
227
|
order: nav.order,
|
230
|
order: nav.order,
|
|
@@ -456,9 +459,13 @@ function scrollHandler() { |
|
@@ -456,9 +459,13 @@ function scrollHandler() { |
456
|
if ($(window).scrollTop() + winH >
|
459
|
if ($(window).scrollTop() + winH >
|
457
|
$(document).height() - 0.25 * $goodsContainer.height() - 50) {
|
460
|
$(document).height() - 0.25 * $goodsContainer.height() - 50) {
|
458
|
if (typeof $pre !== 'undefined') {
|
461
|
if (typeof $pre !== 'undefined') {
|
|
|
462
|
+ if (defaultParams) {
|
|
|
463
|
+ search({type: 'category'}, defaultParams);
|
|
|
464
|
+ } else {
|
459
|
search();
|
465
|
search();
|
460
|
}
|
466
|
}
|
461
|
}
|
467
|
}
|
|
|
468
|
+ }
|
462
|
}
|
469
|
}
|
463
|
|
470
|
|
464
|
// srcoll to load more
|
471
|
// srcoll to load more
|