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

@@ -15,10 +15,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,
@@ -220,8 +220,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');
 
 

@@ -38,8 +38,8 @@
     <div class="price-date">
     <div class="price-date">
         {{# goodsPrice}}
         {{# goodsPrice}}
         <div class="goodsPrice">
         <div class="goodsPrice">
-            <h1 class="currentPrice">¥{{currentPrice}}</h1>
-            <h1 class="previousPrice">¥{{previousPrice}}</h1>
+            <h1 class="currentPrice">{{currentPrice}}</h1>
+            <h1 class="previousPrice">{{previousPrice}}</h1>
         </div>
         </div>
         {{/ goodsPrice}}
         {{/ goodsPrice}}
 
 
@@ -57,7 +57,7 @@
         <li class="icons-item {{#if currentLevel}}current-level{{/if}}">
         <li class="icons-item {{#if currentLevel}}current-level{{/if}}">
             <span class="vip-img " style="background-size:contain;">
             <span class="vip-img " style="background-size:contain;">
             </span>
             </span>
-            <span class="vip-price ">¥{{text}}</span>
+            <span class="vip-price ">{{text}}</span>
         </li>
         </li>
         {{/ list}} 
         {{/ list}} 
     </ul>
     </ul>