Authored by 徐炜

Merge branch 'release/wap-optim' into 'master'

我错了,最后一次修改



See merge request !135
@@ -7,7 +7,6 @@ var $ = require('yoho-jquery'), @@ -7,7 +7,6 @@ var $ = require('yoho-jquery'),
7 7
8 var $employ = $('#employ'), 8 var $employ = $('#employ'),
9 $employ2 = $('#employ2'), 9 $employ2 = $('#employ2'),
10 - $footer = $('#yoho-footer'),  
11 statu = 0, 10 statu = 0,
12 page = 1, 11 page = 1,
13 dic = {}, 12 dic = {},
@@ -40,7 +39,6 @@ var couponAJAX = function(statu, page) { @@ -40,7 +39,6 @@ var couponAJAX = function(statu, page) {
40 if ($(data).find('.null').html()) { 39 if ($(data).find('.null').html()) {
41 if (page === 1) { 40 if (page === 1) {
42 employDom.append($(data).find('.null')); 41 employDom.append($(data).find('.null'));
43 - window.rePosFooter();  
44 } 42 }
45 AjaxFlag = 1; 43 AjaxFlag = 1;
46 return; 44 return;
@@ -65,11 +63,11 @@ $('.employ span').each(function(index, el) { @@ -65,11 +63,11 @@ $('.employ span').each(function(index, el) {
65 $employ.addClass('hide'); 63 $employ.addClass('hide');
66 $employ2.removeClass('hide'); 64 $employ2.removeClass('hide');
67 } 65 }
68 - $footer.removeClass('bottom');  
69 statu = index; 66 statu = index;
70 page = 1; 67 page = 1;
71 AjaxFlag = 0; 68 AjaxFlag = 0;
72 couponAJAX(statu, page); 69 couponAJAX(statu, page);
  70 + window.rePosFooter();
73 }); 71 });
74 }); 72 });
75 73