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');
 
 

@@ -457,5 +457,6 @@ $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');
 }
 }

@@ -23,7 +23,6 @@
             overflow: hidden;
             overflow: hidden;
         }
         }
         .user-name {
         .user-name {
-            float: left;
             max-width: 240rem / $pxConvertRem;
             max-width: 240rem / $pxConvertRem;
             text-overflow:ellipsis; 
             text-overflow:ellipsis; 
             white-space:nowrap; 
             white-space:nowrap; 

@@ -168,6 +168,9 @@
             &.focus {
             &.focus {
                 color: #000;
                 color: #000;
             }
             }
+                .comments-num {
+                    display: none;
+                }
         }
         }
         .comment-nav {
         .comment-nav {
             border-right: 1px solid #ccc;
             border-right: 1px solid #ccc;

@@ -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>

 <ul id="nav-tab" class="nav-tab clearfix">
 <ul id="nav-tab" class="nav-tab clearfix">
-    <li class="comment-nav">商品评价(<span class="comments-num">{{commentsNum}}</span>)</li>
+    <li class="comment-nav">商品评价<span class="comments-num">{{commentsNum}}</span></li>
     <li class="consult-nav">购买咨询(<span class="consults-num">{{consultsNum}}</span>)</li>
     <li class="consult-nav">购买咨询(<span class="consults-num">{{consultsNum}}</span>)</li>
 </ul>
 </ul>
 <div id="feedback-content" >
 <div id="feedback-content" >
@@ -27,7 +27,7 @@
         </div>
         </div>
         {{/if}}
         {{/if}}
         <!-- <div class="comment-content-footer">
         <!-- <div class="comment-content-footer">
-            <a href="{{link}}">查看更多 <span class="iconfont">&#xe604;</span></a> 
+            <a href="{{link}}">查看更多 <span class="iconfont">&#xe604;</span></a>
         </div> -->
         </div> -->
     </div>
     </div>
 
 
@@ -51,8 +51,8 @@
         </div>
         </div>
         <div class="consult-content-footer" data-href="{{link}}">
         <div class="consult-content-footer" data-href="{{link}}">
             <a href="javascript:;">
             <a href="javascript:;">
-                查看更多 
-                <span class="iconfont">&#xe604;</span></a> 
+                查看更多
+                <span class="iconfont">&#xe604;</span></a>
         </div>
         </div>
         {{else}}
         {{else}}
         <div class="consult-content-main content-main no-item">
         <div class="consult-content-main content-main no-item">
@@ -61,9 +61,9 @@
 
 
         <div class="consult-content-footer" data-href="{{link}}">
         <div class="consult-content-footer" data-href="{{link}}">
             <a href="javascript:;">
             <a href="javascript:;">
-                我要咨询 
-                <span class="iconfont">&#xe604;</span></a> 
+                我要咨询
+                <span class="iconfont">&#xe604;</span></a>
         </div>
         </div>
         {{/if}}
         {{/if}}
     </div>
     </div>
-</div>
+</div>