Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into 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;
+});

@@ -19,9 +19,9 @@ myImage.onload = function() {
     $userAvatar.css('background-image', 'url(' + avatar + ')');
     $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');
     $listItem.removeClass('highlight');
     $(this).addClass('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');
     $(this).removeClass('highlight');
 });
 });

@@ -50,9 +50,13 @@ function hiddenTips($ele) {
 //}
 //}
 
 
 function wrapElements(selector, count) {
 function wrapElements(selector, count) {
+    var elArr = null;
+
     $(selector).each(function(idx, el) {
     $(selector).each(function(idx, el) {
-        if (idx % count === 0) {
-            $($(selector).slice(idx, idx + count)).wrapAll($('<div class="js-wraper"></div>'));
+        elArr = $(selector).slice(idx, idx + count);
+
+        if (elArr.length === count && idx % count === 0) {
+            $(elArr).wrapAll($('<div class="js-wraper"></div>'));
         }
         }
     });
     });
 }
 }

@@ -136,6 +136,10 @@
                 color: #e0e0e0;
                 color: #e0e0e0;
                 float: right;
                 float: right;
             }
             }
+
+            &.highlight {
+                background: #eee;
+            }
         }
         }
 
 
         .order-type {
         .order-type {

@@ -141,23 +141,15 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
         border-top: pxToRem(30px) solid #f0f0f0;
         border-top: pxToRem(30px) solid #f0f0f0;
         border-bottom: pxToRem(30px) solid #f0f0f0;
         border-bottom: pxToRem(30px) solid #f0f0f0;
         position: relative;
         position: relative;
-        &:after {
-            content: '';
-            width: 100%;
-            height: 1px;
-            border-top: 1px solid #e0e0e0;
-            position: absolute;
-            left: 0;
-            top: 0;
+
+
+        .list-item {
+            padding: 0 pxToRem(35px);
         }
         }
-        &:before {
-            content: '';
-            width: 100%;
-            height: 1px;
-            border-bottom: 1px solid #e0e0e0;
-            position: absolute;
-            left: 0;
-            bottom: 0;
+        .new-right {
+            float: right;
+            margin-left: pxToRem(40px);
+            color: #e0e0e0;
         }
         }
 
 
         a {
         a {
@@ -165,10 +157,6 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
             display: inline-block;
             display: inline-block;
         }
         }
 
 
-        > span {
-            color: #b0b0b0;
-            font-size: pxToRem(26px);
-        }
     }
     }
 }
 }
 
 

@@ -7,8 +7,8 @@
     </h2>
     </h2>
 
 
     <div class="create-new-suggest">
     <div class="create-new-suggest">
-        <a href="./suggestSub">
-            反馈问题<span>（功能意见，界面意见）</span>
+        <a class="list-item" href="./suggestSub">
+            反馈问题 (功能意见，界面意见)<span class="iconfont new-right">&#xe604;</span>
         </a>
         </a>
     </div>
     </div>