fe / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 5ae0f1887a5c45b94013979b50e93579efd3406f 1 parent bfbc4dd9

修复merge导致的bug

Inline Side-by-side
Showing 1 changed file with 0 additions and 10 deletions
@@ -43,13 +43,10 @@ $searchBox.children('.search-icon').on('touchstart', function() { @@ -43,13 +43,10 @@ $searchBox.children('.search-icon').on('touchstart', function() {
43 $indexSearch.submit(); 43 $indexSearch.submit();
44 }); 44 });
45 45
46 -<<<<<<< HEAD  
47 $('.index-channel img').on('load error', function() { 46 $('.index-channel img').on('load error', function() {
48 window.rePosFooter && window.rePosFooter(); 47 window.rePosFooter && window.rePosFooter();
49 }); 48 });
50 49
51 -=======  
52 ->>>>>>> 39d64e4563c087639080da0a3a7d4f28c38e2b34  
53 $channelLink.on('touchstart', function() { 50 $channelLink.on('touchstart', function() {
54 $channelLink.css({ 51 $channelLink.css({
55 background: '#000', 52 background: '#000',
@@ -67,11 +64,4 @@ $channelLink.on('touchstart', function() { @@ -67,11 +64,4 @@ $channelLink.on('touchstart', function() {
67 color: '#fff', 64 color: '#fff',
68 borderColor: '#fff' 65 borderColor: '#fff'
69 }); 66 });
70 -<<<<<<< HEAD  
71 -=======  
72 -});  
73 -  
74 -$('.index-channel img').on('load error', function() {  
75 - window.rePosFooter && window.rePosFooter();  
76 ->>>>>>> 39d64e4563c087639080da0a3a7d4f28c38e2b34  
77 }); 67 });