Authored by hf

Merge branch 'test' of http://git.dev.yoho.cn/web/yohobuy into test

@@ -4711,7 +4711,7 @@ var goodsDiscountEl = document.getElementById('goodsDiscount'), @@ -4711,7 +4711,7 @@ var goodsDiscountEl = document.getElementById('goodsDiscount'),
4711 goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl); 4711 goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl);
4712 4712
4713 var $cart = $('.cart-bar'); 4713 var $cart = $('.cart-bar');
4714 -var UA = navigator.userAgent.toLowerCase().toString(); 4714 +
4715 4715
4716 require("js/product/detail/desc"); 4716 require("js/product/detail/desc");
4717 require("js/product/detail/comments-consults"); 4717 require("js/product/detail/comments-consults");
@@ -4777,9 +4777,8 @@ $.ajax({ @@ -4777,9 +4777,8 @@ $.ajax({
4777 } 4777 }
4778 }); 4778 });
4779 4779
4780 -if (UA.indexOf('mqqbrowser') > -1) {  
4781 - $('.detail > div').removeClass('column').addClass('oldbox');  
4782 -} 4780 +
  4781 +
4783 require("js/product/detail/like"); 4782 require("js/product/detail/like");
4784 4783
4785 }); 4784 });
@@ -4804,6 +4803,8 @@ var introUrl = $('#introUrl').val(), @@ -4804,6 +4803,8 @@ var introUrl = $('#introUrl').val(),
4804 var sizeSwiper, 4803 var sizeSwiper,
4805 refSwiper; 4804 refSwiper;
4806 4805
  4806 +var UA = navigator.userAgent.toLowerCase().toString();
  4807 +
4807 //判断是否要显示向左滑动提示 4808 //判断是否要显示向左滑动提示
4808 function hiddenTips($ele) { 4809 function hiddenTips($ele) {
4809 var offsetContainer, 4810 var offsetContainer,
@@ -4855,7 +4856,9 @@ function search() { @@ -4855,7 +4856,9 @@ function search() {
4855 4856
4856 hiddenTips($('#size-swiper-container')); 4857 hiddenTips($('#size-swiper-container'));
4857 hiddenTips($('#reference-swiper-container')); 4858 hiddenTips($('#reference-swiper-container'));
4858 - 4859 + if (UA.indexOf('mqqbrowser') > 0) {
  4860 + $('.detail > div').removeClass('column').addClass('oldbox');
  4861 + }
4859 searching = false; 4862 searching = false;
4860 end = true; 4863 end = true;
4861 loading.hideLoadingMask(); 4864 loading.hideLoadingMask();
@@ -5784,7 +5787,6 @@ function loadData($parent, url, page) { @@ -5784,7 +5787,6 @@ function loadData($parent, url, page) {
5784 } else { 5787 } else {
5785 return; 5788 return;
5786 } 5789 }
5787 - window.rePosFooter();  
5788 5790
5789 //},1000); 5791 //},1000);
5790 } 5792 }
This diff could not be displayed because it is too large.