更新到20151208静态资源

@@ -4689,7 +4689,8 @@ $listNav.on('touchstart', 'li', function() {
 
 
 // 用于统计点击了商品列表的第几个商品，序号从1开始计算。
 // 用于统计点击了商品列表的第几个商品，序号从1开始计算。
 if (window._yas) {
 if (window._yas) {
-    window._yas(1 * new Date(), '1.0.13.2', 'yohobuy_m', window._ozuid, '#goods-container >div >div .good-thumb >img');
+    window._yas(1 * new Date(), '1.0.13.2', 'yohobuy_m', window._ozuid,
+        '', '#goods-container >div >div .good-thumb >img');
 }
 }
 });
 });
 define("js/product/detail/detail", ["jquery","swiper","hammer","lazyload","index"], function(require, exports, module){
 define("js/product/detail/detail", ["jquery","swiper","hammer","lazyload","index"], function(require, exports, module){
@@ -4708,7 +4709,8 @@ var goodsSwiper,
     $discountArrow = $('.goodsDiscount .first-item span');
     $discountArrow = $('.goodsDiscount .first-item span');
 
 
 var goodsDiscountEl = document.getElementById('goodsDiscount'),
 var goodsDiscountEl = document.getElementById('goodsDiscount'),
-    goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl);
+    goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl),
+    $discountFirstItem = $(goodsDiscountEl).find('.first-item');
 
 
 var $cart = $('.cart-bar');
 var $cart = $('.cart-bar');
 
 
@@ -4757,9 +4759,11 @@ if (0 === $discountFolder.children().length) {
 if (goodsDiscountHammer && $discountFolder.children().length > 0) {
 if (goodsDiscountHammer && $discountFolder.children().length > 0) {
     goodsDiscountHammer.on('tap', function(e) {
     goodsDiscountHammer.on('tap', function(e) {
         if ($discountFolder.is(':hidden')) {
         if ($discountFolder.is(':hidden')) {
+            $discountFirstItem.removeClass('short-text');
             $discountArrow.removeClass('icon-down').addClass('icon-up').html('');
             $discountArrow.removeClass('icon-down').addClass('icon-up').html('');
             $discountFolder.slideDown();
             $discountFolder.slideDown();
         } else {
         } else {
+            $discountFirstItem.addClass('short-text');
             $discountArrow.removeClass('icon-up').addClass('icon-down').html('');
             $discountArrow.removeClass('icon-up').addClass('icon-down').html('');
             $discountFolder.slideUp();
             $discountFolder.slideUp();
         }
         }
@@ -4805,7 +4809,6 @@ var introUrl = $('#introUrl').val(),
 var sizeSwiper,
 var sizeSwiper,
     refSwiper;
     refSwiper;
 
 
-var UA = navigator.userAgent.toLowerCase().toString();
 
 
 //判断是否要显示向左滑动提示
 //判断是否要显示向左滑动提示
 function hiddenTips($ele) {
 function hiddenTips($ele) {
@@ -4825,6 +4828,19 @@ function hiddenTips($ele) {
     }
     }
 }
 }
 
 
+function isFlexSupport() {
+    var flex = document.createElement('p').style.flex,
+        webkitFlex = document.createElement('p').style.webkitFlex,
+        flexWrap = document.createElement('p').style.flexWrap;
+
+    if ((flex === '' || webkitFlex === '') && flexWrap === '') {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+
 function search() {
 function search() {
     if (searching || end) {
     if (searching || end) {
         return;
         return;
@@ -4858,8 +4874,9 @@ function search() {
 
 
             hiddenTips($('#size-swiper-container'));
             hiddenTips($('#size-swiper-container'));
             hiddenTips($('#reference-swiper-container'));
             hiddenTips($('#reference-swiper-container'));
-            if (UA.indexOf('mqqbrowser') > 0) {
-                $('.detail > div').removeClass('column').addClass('oldbox');
+
+            if (!isFlexSupport()) {
+                $('.detail .column').removeClass('column').addClass('oldbox');
             }
             }
             searching = false;
             searching = false;
             end = true;
             end = true;
@@ -5696,10 +5713,10 @@ var $navLi = $('#fav-tab > li'),
     swiperObj = {},
     swiperObj = {},
     favTabHammer,
     favTabHammer,
     favContentHammer,
     favContentHammer,
-    footerH = $('#yoho-footer').height(),
     $loadMore = $('.fav-load-more'),
     $loadMore = $('.fav-load-more'),
     $brandLoadMore = $('.fav-brand-load-more'),
     $brandLoadMore = $('.fav-brand-load-more'),
     winH = $(window).height(),
     winH = $(window).height(),
+    footerH = $('#yoho-footer').height(),
     $favProductList = $('.fav-product-list'),
     $favProductList = $('.fav-product-list'),
     $favBrandList = $('.fav-brand-swiper-wrapper'),
     $favBrandList = $('.fav-brand-swiper-wrapper'),
     pageId = 1,
     pageId = 1,
@@ -5901,8 +5918,8 @@ favContentHammer.on('tap', function(e) {
 
 
 function scrollHandler() {
 function scrollHandler() {
 
 
-    if ($(window).scrollTop() + winH >= $(document).height() - footerH) {
-
+    //距离底部未1/4列表高度+底部高度的时候加载更多
+    if ($(window).scrollTop() + winH >= $(document).height() - 0.25 * $favBrandList.height() - footerH) {
         if (brandTab) {
         if (brandTab) {
             $brandLoadMore.filter('.hide').removeClass('hide');
             $brandLoadMore.filter('.hide').removeClass('hide');
 
 
@@ -5924,9 +5941,7 @@ function scrollHandler() {
 }
 }
 
 
 //srcoll to load more
 //srcoll to load more
-$(window).scroll(function() {
-    window.requestAnimationFrame(scrollHandler);
-});
+$(window).scroll(scrollHandler);
 });
 });
 define("js/me/suggest", ["jquery","hammer","lazyload","handlebars","source-map"], function(require, exports, module){
 define("js/me/suggest", ["jquery","hammer","lazyload","handlebars","source-map"], function(require, exports, module){
 /**
 /**