|
@@ -51,6 +51,7 @@ let searchView = function() { |
|
@@ -51,6 +51,7 @@ let searchView = function() { |
51
|
let body = document.body;
|
51
|
let body = document.body;
|
52
|
let $c = $('#new-goods');
|
52
|
let $c = $('#new-goods');
|
53
|
let $navBox = $c.find('.filter-nav');
|
53
|
let $navBox = $c.find('.filter-nav');
|
|
|
54
|
+ let $newList = $c.find('.new-list');
|
54
|
let $goodsWraper = $c.find('.goods-container');
|
55
|
let $goodsWraper = $c.find('.goods-container');
|
55
|
|
56
|
|
56
|
let goodsT = require('product/new/goods.hbs');
|
57
|
let goodsT = require('product/new/goods.hbs');
|
|
@@ -168,7 +169,7 @@ let searchView = function() { |
|
@@ -168,7 +169,7 @@ let searchView = function() { |
168
|
return;
|
169
|
return;
|
169
|
}
|
170
|
}
|
170
|
|
171
|
|
171
|
- let order = $activeNav.data('order') || $activeNav.find('.cur').data('order');
|
172
|
+ let order = $activeNav.attr('data-order') || $activeNav.find('.cur').data('order');
|
172
|
|
173
|
|
173
|
searchParams.order = order;
|
174
|
searchParams.order = order;
|
174
|
changeAction();
|
175
|
changeAction();
|
|
@@ -256,6 +257,25 @@ let searchView = function() { |
|
@@ -256,6 +257,25 @@ let searchView = function() { |
256
|
$navBox.on('click', 'li', function(event) {
|
257
|
$navBox.on('click', 'li', function(event) {
|
257
|
let $curNav = $(event.currentTarget);
|
258
|
let $curNav = $(event.currentTarget);
|
258
|
|
259
|
|
|
|
260
|
+ // 处理新添加的默认,最新排序
|
|
|
261
|
+ if ($curNav.hasClass('first-li-more')) {
|
|
|
262
|
+ filter.hideFilter();
|
|
|
263
|
+
|
|
|
264
|
+ if ($newList.hasClass('hide')) {
|
|
|
265
|
+ $curNav.find('.up').removeClass('hide');
|
|
|
266
|
+ $curNav.find('.down').addClass('hide');
|
|
|
267
|
+ $newList.removeClass('hide');
|
|
|
268
|
+ } else {
|
|
|
269
|
+ $curNav.find('.up').addClass('hide');
|
|
|
270
|
+ $curNav.find('.down').removeClass('hide');
|
|
|
271
|
+ $newList.addClass('hide');
|
|
|
272
|
+ }
|
|
|
273
|
+
|
|
|
274
|
+ return;
|
|
|
275
|
+ }
|
|
|
276
|
+
|
|
|
277
|
+ $newList.addClass('hide');
|
|
|
278
|
+
|
259
|
let $activeNav = switchNav($curNav);
|
279
|
let $activeNav = switchNav($curNav);
|
260
|
|
280
|
|
261
|
checkOrderChange($activeNav, function() {
|
281
|
checkOrderChange($activeNav, function() {
|
|
@@ -268,6 +288,37 @@ let searchView = function() { |
|
@@ -268,6 +288,37 @@ let searchView = function() { |
268
|
});
|
288
|
});
|
269
|
});
|
289
|
});
|
270
|
});
|
290
|
});
|
|
|
291
|
+
|
|
|
292
|
+ // 单独处理默认、最新排序条件
|
|
|
293
|
+ $newList.on('click', 'li', function(event) {
|
|
|
294
|
+ let $defaultCurNav = $(event.currentTarget);
|
|
|
295
|
+ let $firstMore = $('.first-li-more');
|
|
|
296
|
+
|
|
|
297
|
+ $newList.addClass('hide');
|
|
|
298
|
+ $firstMore.find('.up').addClass('hide');
|
|
|
299
|
+ $firstMore.find('.down').removeClass('hide');
|
|
|
300
|
+
|
|
|
301
|
+ if ($defaultCurNav.hasClass('new')) {
|
|
|
302
|
+ $firstMore.attr('data-order', 's_t_desc').find('.span-test').text('最新');
|
|
|
303
|
+ $defaultCurNav.addClass('active');
|
|
|
304
|
+ $newList.find('.default').removeClass('active');
|
|
|
305
|
+ } else {
|
|
|
306
|
+ $firstMore.attr('data-order', '').find('.span-test').text('默认');
|
|
|
307
|
+ $defaultCurNav.addClass('active');
|
|
|
308
|
+ $newList.find('.new').removeClass('active');
|
|
|
309
|
+ }
|
|
|
310
|
+
|
|
|
311
|
+ checkOrderChange($firstMore, function() {
|
|
|
312
|
+ fetchNew({ // eslint-disable-line
|
|
|
313
|
+ $box: $goodBox,
|
|
|
314
|
+ before: $box => {
|
|
|
315
|
+ fetchXhr.abort();
|
|
|
316
|
+ $box.html('');
|
|
|
317
|
+ }
|
|
|
318
|
+ });
|
|
|
319
|
+ });
|
|
|
320
|
+ });
|
|
|
321
|
+
|
271
|
});
|
322
|
});
|
272
|
|
323
|
|
273
|
$(window).scroll(function() {
|
324
|
$(window).scroll(function() {
|