Authored by 姜枫

Merge branch 'release/wap-optim' of http://git.yoho.cn/fe/yohobuywap-node into release/wap-optim

@@ -31,10 +31,10 @@ module.exports = { @@ -31,10 +31,10 @@ module.exports = {
31 // service: 'http://192.168.102.205:8080/gateway/', 31 // service: 'http://192.168.102.205:8080/gateway/',
32 // search: 'http://192.168.102.216:8080/yohosearch/' 32 // search: 'http://192.168.102.216:8080/yohosearch/'
33 33
34 - // api: 'http://api.yoho.yohoops.org/',  
35 - // service: 'http://service.yoho.yohoops.org/',  
36 - // liveApi: 'http://api.live.yoho.cn/',  
37 - // singleApi: 'http://single.yoho.cn/' 34 + //api: 'http://api.yoho.yohoops.org/',
  35 + //service: 'http://service.yoho.yohoops.org/',
  36 + //liveApi: 'http://api.live.yoho.cn/',
  37 + //singleApi: 'http://single.yoho.cn/'
38 38
39 // api: 'http://dev-api.yohops.com:9999/', 39 // api: 'http://dev-api.yohops.com:9999/',
40 // service: 'http://dev-service.yohops.com:9999/', 40 // service: 'http://dev-service.yohops.com:9999/',
@@ -755,27 +755,25 @@ if ($brandHeader.data('isbaseshop') === true) { @@ -755,27 +755,25 @@ if ($brandHeader.data('isbaseshop') === true) {
755 } 755 }
756 756
757 $.extend(defaultOpt, pars); 757 $.extend(defaultOpt, pars);
758 - // setTimeout(function() {  
759 - $.ajax({  
760 - type: 'GET',  
761 - url: location.protocol + '//m.yohobuy.com/product/search/filter',  
762 - data: defaultOpt,  
763 - success: function(data) {  
764 - $goodsContainer.append(data); 758 + $.ajax({
  759 + type: 'GET',
  760 + url: location.protocol + '//m.yohobuy.com/product/search/filter',
  761 + data: defaultOpt,
  762 + success: function(data) {
  763 + $goodsContainer.append(data);
765 764
766 - // 初始化filter&注册filter回调  
767 - filter.initFilter({  
768 - fCbFn: search,  
769 - hCbFn: function() { 765 + // 初始化filter&注册filter回调
  766 + filter.initFilter({
  767 + fCbFn: search,
  768 + hCbFn: function() {
770 769
771 - // 切换active状态到$pre上  
772 - $pre.addClass('active');  
773 - $pre.siblings('.filter').removeClass('active');  
774 - }  
775 - });  
776 - }  
777 - });  
778 - // }, 500); 770 + // 切换active状态到$pre上
  771 + $pre.addClass('active');
  772 + $pre.siblings('.filter').removeClass('active');
  773 + }
  774 + });
  775 + }
  776 + });
779 }()); 777 }());
780 778
781 779
@@ -1076,9 +1074,9 @@ if ($brandHeader.length > 0) { @@ -1076,9 +1074,9 @@ if ($brandHeader.length > 0) {
1076 } 1074 }
1077 1075
1078 // 初始请求最新第一页数据 1076 // 初始请求最新第一页数据
1079 -// setTimeout(function() { 1077 +setTimeout(function() {
1080 search(); 1078 search();
1081 -// }, 500); 1079 +}, 500);
1082 1080
1083 $listNav.on('touchstart', 'li', function() { 1081 $listNav.on('touchstart', 'li', function() {
1084 $listNav.find('li').removeClass('bytouch'); 1082 $listNav.find('li').removeClass('bytouch');