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

@@ -80,9 +80,6 @@ function loadData($parent, url, page) {
             page: page
         },
         success: function(data) {
-
-            //setTimeout(function() { //模拟延时
-
             if (url === 'favBrand') {
                 $brandLoadMore.addClass('hide');
             } else {
@@ -95,7 +92,6 @@ function loadData($parent, url, page) {
             } else if (data === 'end') {
                 $parent.closest('.fav-type').find('.fav-load-background')
                     .removeClass('fav-load-background').html('没有更多了');
-
             } else if (data.length > 10) {
                 $parent.append(data);
                 $parent.closest('.fav-type').find('.fav-content-loading').remove();
@@ -106,14 +102,8 @@ function loadData($parent, url, page) {
                 } else {
                     lockId = false;//请求成功后解锁商品收藏page++
                 }
-
-                window.rePosFooter();
-
-            } else {
-                return;
             }
-
-            //},1000);
+            window.rePosFooter();
         }
     });
 }
@@ -243,6 +233,10 @@ function scrollHandler() {
 }
 
 //srcoll to load more
-$(window).scroll(function() {
-    window.requestAnimationFrame(scrollHandler);
+$(window).scroll(scrollHandler);
+
+$(document).on('touchend', '.swiper-header', function() {
+    var url = $(this).find('.fav-more').attr('href');
+
+    window.location.href = url;
 });

@@ -19,9 +19,9 @@ myImage.onload = function() {
     $userAvatar.css('background-image', 'url(' + avatar + ')');
 };
 
-$('.yoho-page').on('touchstart', '.list-item, .type-item', function() {
+$('.yoho-page').on('touchstart', '.list-item, .type-item, .order-title', function() {
     $listItem.removeClass('highlight');
     $(this).addClass('highlight');
-}).on('touchend touchcancel', '.list-item, .type-item', function() {
+}).on('touchend touchcancel', '.list-item, .type-item, .order-title', function() {
     $(this).removeClass('highlight');
 });

@@ -37,19 +37,32 @@ 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 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 wrapElements(selector, count) {
+    var elArr = null;
+
+    $(selector).each(function(idx, el) {
+        elArr = $(selector).slice(idx, idx + count);
+
+        if (elArr.length === count && idx % count === 0) {
+            $(elArr).wrapAll($('<div class="js-wraper"></div>'));
         }
+    });
 }
 
 
+
 function search() {
     if (searching || end) {
         return;
@@ -84,9 +97,10 @@ function search() {
             hiddenTips($('#size-swiper-container'));
             hiddenTips($('#reference-swiper-container'));
 
-            if (!isFlexSupport()) {
-                $('.detail .column').removeClass('column').addClass('oldbox');
-            }
+            //if (!isFlexSupport()) {
+            //    $('.detail .column').removeClass('column').addClass('oldbox');
+            //}
+            wrapElements('.detail .column', 2);
             searching = false;
             end = true;
             loading.hideLoadingMask();

@@ -72,7 +72,7 @@
             width: pxToRem(472px);
             height: pxToRem(88px);
             line-height: pxToRem(88px);
-            margin: pxToRem(125px) auto 0 auto;
+            margin: pxToRem(80px) auto 0 auto;
             background: #444;
             text-align: center;
             color: #fff;

@@ -114,7 +114,7 @@
         &.no-login {
             padding: 0;
             height: pxToRem(88px);
-            .link-item {
+            .link-item p {
                 font-size: pxToRem(32px);
                 line-height: pxToRem(88px);
             }
@@ -136,6 +136,10 @@
                 color: #e0e0e0;
                 float: right;
             }
+
+            &.highlight {
+                background: #eee;
+            }
         }
 
         .order-type {

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

@@ -47,6 +47,7 @@ $basicBtnC:#eb0313;
             }
 
             &.table {
+                .js-wraper {
                     @include flexbox((
                     display: box,
                     box-lines: multiple,
@@ -57,6 +58,7 @@ $basicBtnC:#eb0313;
                          flex-wrap: wrap,
                          justify-content: flex-start
                      ));
+                 }
                      width: 100%;
                      .column {
                          box-sizing: border-box;
@@ -91,6 +93,7 @@ $basicBtnC:#eb0313;
                          white-space:nowrap;
                          overflow:hidden;
                      }
+
             }
         }
     }

@@ -187,10 +187,14 @@ class UserModel
             $datas = array();
             $product = array();
             foreach ($favProduct['data']['product_list'] as $val) {
+	            if (empty($val['product_skn'])) {
+		            continue;
+	            }
+
                 $product = array();
                 $product['fav_id'] = $val['product_id'];
-                $product['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_id'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
-                $product['imgUrl'] = Helpers::getImageUrl($val['image'], 447, 596);
+                $product['link'] = isset($val['goodsId'], $val['cnAlphabet']) ? Helpers::url('/product/pro_' . $val['product_id'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
+                $product['imgUrl'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : '';
                 ;
                 $product['title'] = $val['product_name'];
                 $product['price'] = !empty($val['market_price']) ? '¥' . $val['market_price'] . '.00' : 0;
@@ -247,8 +251,12 @@ class UserModel
                 // 处理品牌产品
                 $product = array();
                 foreach ($val['new_product'] as $one) {
+	                if (empty($one['product_skn'])) {
+		                continue;
+	                }
+
                     $product = array();
-	                $product['link'] = isset($one['goods'][0]) ? Helpers::url('/product/pro_' . $one['product_id'] . '_' . $one['goods'][0]['id'] . '/' . $one['cnAlphabet'] . '.html') : '';
+	                $product['link'] = isset($one['goods'][0], $one['cnAlphabet']) ? Helpers::url('/product/pro_' . $one['product_id'] . '_' . $one['goods'][0]['id'] . '/' . $one['cnAlphabet'] . '.html') : '';
                     $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : '';
                     $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0;
                     $product['discount'] = ($one['market_price'] > $one['sales_price']) ? '¥' . $one['sales_price'] : false;

@@ -177,7 +177,7 @@ class NewsaleController extends AbstractAction
             $color = $this->get('color', null);
             $size = $this->get('size', null);
             $price = $this->get('price', null);
-            $p_d = '0.1,0.3';
+            $p_d = $this->get('discount', null);
             $dayLimit = $this->get('dayLimit', null);
             $limit = $this->get('limit', 60);
             $page = $this->get('page', 1);