Merge remote-tracking branch 'origin/develop'

@@ -234,3 +234,9 @@ function scrollHandler() {
 
 
 //srcoll to load more
 //srcoll to load more
 $(window).scroll(scrollHandler);
 $(window).scroll(scrollHandler);
+
+$(document).on('touchend', '.swiper-header', function() {
+    var url = $(this).find('.fav-more').attr('href');
+
+    window.location.href = url;
+});

@@ -37,19 +37,28 @@ 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) {
+    $(selector).each(function(idx, el) {
+        if (idx % count === 0) {
+            $($(selector).slice(idx, idx + count)).wrapAll($('<div class="js-wraper"></div>'));
         }
         }
+    });
 }
 }
 
 
 
 
+
 function search() {
 function search() {
     if (searching || end) {
     if (searching || end) {
         return;
         return;
@@ -84,9 +93,10 @@ function search() {
             hiddenTips($('#size-swiper-container'));
             hiddenTips($('#size-swiper-container'));
             hiddenTips($('#reference-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;
             searching = false;
             end = true;
             end = true;
             loading.hideLoadingMask();
             loading.hideLoadingMask();

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