fe / yohobuywap-node · Commits

Go to a project

Authored by 毕凯
Commit ab18e08818525553ee45dce45767d91ead5bc950 2 parents 7c7201d2 3a8c3d4a

Merge branch 'master' into feature/expandNewTrend

Inline Side-by-side
Showing 3 changed files with 5 additions and 2 deletions
1 { 1 {
2 "name": "m-yohobuy-node", 2 "name": "m-yohobuy-node",
3 - "version": "6.0.2", 3 + "version": "6.0.3",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {
@@ -238,7 +238,7 @@ class ProductListWithFilter { @@ -238,7 +238,7 @@ class ProductListWithFilter {
238 // 初始化filter&注册filter回调 238 // 初始化filter&注册filter回调
239 filter.initFilter({ 239 filter.initFilter({
240 fCbFn: () => { 240 fCbFn: () => {
241 - this.getGoodsList(); 241 + this.getGoodsList({ navTouch: true });
242 }, 242 },
243 hCbFn: () => { 243 hCbFn: () => {
244 244
@@ -22,17 +22,20 @@ productListWithFilter.scrollActived = false; @@ -22,17 +22,20 @@ productListWithFilter.scrollActived = false;
22 22
23 Tab.prototype.home = function() { // 隐藏筛选 TAB 23 Tab.prototype.home = function() { // 隐藏筛选 TAB
24 $filterBox.css('display', 'none'); 24 $filterBox.css('display', 'none');
  25 + $('.filter-mask').addClass('hide');
25 productListWithFilter.scrollActived = false; 26 productListWithFilter.scrollActived = false;
26 }; 27 };
27 Tab.prototype.getallgoods = function() { // 显示筛选 TAB 28 Tab.prototype.getallgoods = function() { // 显示筛选 TAB
28 $listNav.find('li').removeClass('active'); 29 $listNav.find('li').removeClass('active');
29 $listNav.find('.default').addClass('active'); 30 $listNav.find('.default').addClass('active');
30 $filterBox.css('display', 'block'); 31 $filterBox.css('display', 'block');
  32 + $('.filter-mask').addClass('hide');
31 productListWithFilter.getGoodsList({type: 'default', page: 1}); 33 productListWithFilter.getGoodsList({type: 'default', page: 1});
32 productListWithFilter.scrollActived = true; 34 productListWithFilter.scrollActived = true;
33 }; 35 };
34 Tab.prototype.getnewgoods = function() { 36 Tab.prototype.getnewgoods = function() {
35 $filterBox.css('display', 'none'); 37 $filterBox.css('display', 'none');
  38 + $('.filter-mask').addClass('hide');
36 productListWithFilter.getGoodsList({type: 'new', page: 1}); 39 productListWithFilter.getGoodsList({type: 'new', page: 1});
37 productListWithFilter.scrollActived = true; 40 productListWithFilter.scrollActived = true;
38 }; 41 };