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

@@ -15,10 +15,10 @@ var $navLi = $('#fav-tab > li'),
     swiperObj = {},
     favTabHammer,
     favContentHammer,
-    footerH = $('#yoho-footer').height(),
     $loadMore = $('.fav-load-more'),
     $brandLoadMore = $('.fav-brand-load-more'),
     winH = $(window).height(),
+    footerH = $('#yoho-footer').height(),
     $favProductList = $('.fav-product-list'),
     $favBrandList = $('.fav-brand-swiper-wrapper'),
     pageId = 1,
@@ -220,8 +220,8 @@ favContentHammer.on('tap', function(e) {
 
 function scrollHandler() {
 
-    if ($(window).scrollTop() + winH >= $(document).height() - footerH) {
-
+    //距离底部未1/4列表高度+底部高度的时候加载更多
+    if ($(window).scrollTop() + winH >= $(document).height() - 0.25 * $favBrandList.height() - footerH) {
         if (brandTab) {
             $brandLoadMore.filter('.hide').removeClass('hide');
 

@@ -18,7 +18,6 @@ var introUrl = $('#introUrl').val(),
 var sizeSwiper,
     refSwiper;
 
-var UA = navigator.userAgent.toLowerCase().toString();
 
 //判断是否要显示向左滑动提示
 function hiddenTips($ele) {
@@ -38,6 +37,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() {
     if (searching || end) {
         return;
@@ -71,8 +83,9 @@ function search() {
 
             hiddenTips($('#size-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;
             end = true;

@@ -457,5 +457,6 @@ $listNav.on('touchstart', 'li', function() {
 
 // 用于统计点击了商品列表的第几个商品，序号从1开始计算。
 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');
 }
\ No newline at end of file

@@ -88,9 +88,13 @@
             position: relative;
             float: left;
             color: #fff;
-            font-size: pxToRem(22px);
-            line-height: pxToRem(38px);
-            width: pxToRem(213px);
+            font-size: pxToRem(32px);
+            width: pxToRem(320px);
+            // width: pxToRem(213px); 三栏宽度
+            
+            p {
+                font-size: pxToRem(22px);
+            }
 
             &:after {
                 content: '';

@@ -113,7 +113,9 @@
             display: block;
         }
     }
-
+    .cost {
+        padding: 0 0 0 30rem / $pxConvertRem;
+    }
     .cost li {
         height: 90rem / $pxConvertRem;
         line-height: 90rem / $pxConvertRem;
@@ -125,6 +127,7 @@
         }
         > span {
             float: right;
+            padding: 0 30rem / $pxConvertRem 0 0;
         }
     }
 

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

@@ -350,12 +350,18 @@ $basicBtnC:#eb0313;
         background-color: #fff;
         border-bottom: 1px solid $borderC;
         h1 {
-            padding: pxToRem(30px) pxToRem(28px);
+            position: relative;
+            padding: pxToRem(30px) pxToRem(60px) pxToRem(30px) pxToRem(28px);
             line-height: pxToRem(36px);
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
             // line-height: pxToRem(88px);
         }
         .iconfont {
-            display: inline-block;
+            position: absolute;
+            top: pxToRem(30px);
+            right: pxToRem(36px);
             width: pxToRem(35px);
             font-size: pxToRem(45px);
             float: right;

@@ -28,10 +28,14 @@
                 {{#isLogin}}{{brand_favorite_total}}{{/isLogin}}
                 <p>收藏的品牌</p>
             </a>
+            {{!
             <a class="link-item" href="/home/record">
-                {{#isLogin}}{{product_browse}}{{/isLogin}}
+                <!-- product_browse -->
+
                 <p>浏览记录</p>
             </a>
+            }}
+
         </div>
         <div class="my-order">
             <div class="order-title">
@@ -102,6 +106,7 @@
                 <span class="iconfont num">&#xe604;</span>
             </a>
         </div>
+        {{!
         <div class="group-list">
             <a class="list-item" href="/help.html">
                 <span class="iconfont icon">&#xe639;</span>
@@ -109,6 +114,7 @@
                 <span class="iconfont num">&#xe604;</span>
             </a>
         </div>
+        }}
 
         {{> product/recommend-for-you}}
         {{> product/suspend-cart}}

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

 <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>
 </ul>
 <div id="feedback-content" >
@@ -27,7 +27,7 @@
         </div>
         {{/if}}
         <!-- <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>
 
@@ -51,8 +51,8 @@
         </div>
         <div class="consult-content-footer" data-href="{{link}}">
             <a href="javascript:;">
-                查看更多 
-                <span class="iconfont">&#xe604;</span></a> 
+                查看更多
+                <span class="iconfont">&#xe604;</span></a>
         </div>
         {{else}}
         <div class="consult-content-main content-main no-item">
@@ -61,9 +61,9 @@
 
         <div class="consult-content-footer" data-href="{{link}}">
             <a href="javascript:;">
-                我要咨询 
-                <span class="iconfont">&#xe604;</span></a> 
+                我要咨询
+                <span class="iconfont">&#xe604;</span></a>
         </div>
         {{/if}}
     </div>
-</div>
\ No newline at end of file
+</div>