wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 9de213cf0d424fea434302534b20eaf264e30419 2 parents 21b733d6 cbe96305

update

Inline Side-by-side
Showing 2 changed files with 6 additions and 1 deletions
@@ -61,7 +61,12 @@ navHammer.on('tap', function(event) { @@ -61,7 +61,12 @@ navHammer.on('tap', function(event) {
61 overflow: 'hidden' 61 overflow: 'hidden'
62 }); 62 });
63 } 63 }
  64 +<<<<<<< HEAD
64 event.srcEvent.stopPropagation(); 65 event.srcEvent.stopPropagation();
  66 +=======
  67 +
  68 + // event.stopPropagation();
  69 +>>>>>>> cbe96305668d79dee3cd5fb854d96098141e0f65
65 }); 70 });
66 71
67 //点击页面主体，收起侧栏导航及二级导航 72 //点击页面主体，收起侧栏导航及二级导航
@@ -105,7 +105,7 @@ $(window).scroll(function () { @@ -105,7 +105,7 @@ $(window).scroll(function () {
105 105
106 //lazyLoad 106 //lazyLoad
107 lazyLoad($goodList.children('.good-info:gt(' + (num - 1) + ')').find('img.lazy')); 107 lazyLoad($goodList.children('.good-info:gt(' + (num - 1) + ')').find('img.lazy'));
108 - 108 +
109 loading = false; 109 loading = false;
110 page++; 110 page++;
111 }, 111 },