Authored by 梁志锋

update

framework @ 119c247f
1 -Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2 1 +Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
@@ -52,14 +52,6 @@ if ($brandList.length > 0) { @@ -52,14 +52,6 @@ if ($brandList.length > 0) {
52 }); 52 });
53 } 53 }
54 54
55 -// $('#right-bar .con').find('b').unbind().on('tap', function() {  
56 -// var index = $(this).index();  
57 -  
58 -// if ($('.bar-' + index).size() > 0) {  
59 -// document.body.scrollTop = parseInt($('.bar-' + index)[0].offsetTop) - parseInt(brandSwipe - 1);  
60 -// }  
61 -// });  
62 -  
63 myHammer = new Hammer($('#right-bar .con').find('b').unbind()[0]); 55 myHammer = new Hammer($('#right-bar .con').find('b').unbind()[0]);
64 myHammer.on('tap', function(e) { 56 myHammer.on('tap', function(e) {
65 var index = $(this).index(); 57 var index = $(this).index();
@@ -61,7 +61,7 @@ navHammer.on('tap', function(event) { @@ -61,7 +61,7 @@ navHammer.on('tap', function(event) {
61 overflow: 'hidden' 61 overflow: 'hidden'
62 }); 62 });
63 } 63 }
64 - event.stopPropagation(); 64 + event.srcEvent.stopPropagation();
65 }); 65 });
66 66
67 //点击页面主体,收起侧栏导航及二级导航 67 //点击页面主体,收起侧栏导航及二级导航
@@ -99,11 +99,12 @@ $(window).scroll(function () { @@ -99,11 +99,12 @@ $(window).scroll(function () {
99 } 99 }
100 return; 100 return;
101 } 101 }
  102 +
102 $goodList.append(data); 103 $goodList.append(data);
  104 + num = $goodList.find('.good-info').length;
103 105
104 //lazyLoad 106 //lazyLoad
105 - //lazyLoad($goodList.children('.good-info:gt(' + (num - 1) + ')').find('img.lazy'));  
106 - lazyLoad($('.good-info').find('img.lazy')); 107 + lazyLoad($goodList.children('.good-info:gt(' + (num - 1) + ')').find('img.lazy'));
107 108
108 loading = false; 109 loading = false;
109 page++; 110 page++;