Authored by biao

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

@@ -233,4 +233,10 @@ function scrollHandler() { @@ -233,4 +233,10 @@ function scrollHandler() {
233 } 233 }
234 234
235 //srcoll to load more 235 //srcoll to load more
236 -$(window).scroll(scrollHandler);  
  236 +$(window).scroll(scrollHandler);
  237 +
  238 +$(document).on('touchend', '.swiper-header', function() {
  239 + var url = $(this).find('.fav-more').attr('href');
  240 +
  241 + window.location.href = url;
  242 +});
@@ -19,9 +19,9 @@ myImage.onload = function() { @@ -19,9 +19,9 @@ myImage.onload = function() {
19 $userAvatar.css('background-image', 'url(' + avatar + ')'); 19 $userAvatar.css('background-image', 'url(' + avatar + ')');
20 }; 20 };
21 21
22 -$('.yoho-page').on('touchstart', '.list-item, .type-item', function() { 22 +$('.yoho-page').on('touchstart', '.list-item, .type-item, .order-title', function() {
23 $listItem.removeClass('highlight'); 23 $listItem.removeClass('highlight');
24 $(this).addClass('highlight'); 24 $(this).addClass('highlight');
25 -}).on('touchend touchcancel', '.list-item, .type-item', function() { 25 +}).on('touchend touchcancel', '.list-item, .type-item, .order-title', function() {
26 $(this).removeClass('highlight'); 26 $(this).removeClass('highlight');
27 }); 27 });
@@ -136,6 +136,10 @@ @@ -136,6 +136,10 @@
136 color: #e0e0e0; 136 color: #e0e0e0;
137 float: right; 137 float: right;
138 } 138 }
  139 +
  140 + &.highlight {
  141 + background: #eee;
  142 + }
139 } 143 }
140 144
141 .order-type { 145 .order-type {