Merge remote-tracking branch 'origin/hotfix/xieweiguang'

@@ -32,9 +32,15 @@ var navHammer;
 $('#search-input').focus(function() {
 $('#search-input').focus(function() {
     $(this).blur();
     $(this).blur();
 });
 });
+$nav.bind('contextmenu', function(e) {
+    return false;
+});
+$('.category-container').bind('contextmenu', function(e) {
+    return false;
+});
 
 
 navHammer = new Hammer($nav[0]);
 navHammer = new Hammer($nav[0]);
-navHammer.on('tap', function(e) {
+navHammer.on('tap pressup', function(e) {
     var $this = $(e.target).closest('li'),
     var $this = $(e.target).closest('li'),
         index = $this.index();
         index = $this.index();
 
 
@@ -71,7 +77,7 @@ $categoryContainer.on('touchend', function(e) {
     }
     }
 });
 });
 
 
-$categoryContainer.find('.primary-level').on('touchstart', 'li', function() {
+$categoryContainer.find('.primary-level').on('touchstart touchend touchcancel', 'li', function() {
     $primaryItem.removeClass('highlight');
     $primaryItem.removeClass('highlight');
     $(this).addClass('highlight');
     $(this).addClass('highlight');
 }).on('touchend touchcancel', 'li', function() {
 }).on('touchend touchcancel', 'li', function() {
@@ -84,3 +90,11 @@ $categoryContainer.find('.sub-level').on('touchstart', 'li', function() {
 }).on('touchend touchcancel', 'li', function() {
 }).on('touchend touchcancel', 'li', function() {
     $(this).removeClass('highlight');
     $(this).removeClass('highlight');
 });
 });
+
+$nav.on('touchstart', function(e) {
+    var target = e.target || e.srcElement;
+
+    target.parentNode.className = 'bytouch ' + target.parentNode.className;
+}).on('touchend touchcancel', function() {
+    $nav.find('li').removeClass('bytouch');
+});

@@ -56,9 +56,12 @@ info.initInfosEvt($infoList);
         };
         };
     });
     });
 }());
 }());
-
+$nav.bind('contextmenu', function(e) {
+    return false;
+});
 navHammer = new Hammer($nav[0]);
 navHammer = new Hammer($nav[0]);
-navHammer.on('tap', function(e) {
+navHammer.on('tap pressup', function(e) {
+
     var $this = $(e.target).closest('.guang-nav-item'),
     var $this = $(e.target).closest('.guang-nav-item'),
         $content,
         $content,
         index;
         index;
@@ -112,4 +115,12 @@ $(document).scroll(function() {
     if ($(window).scrollTop() + winH >= $(document).height() - 0.25 * $c.height()) {
     if ($(window).scrollTop() + winH >= $(document).height() - 0.25 * $c.height()) {
         loadMore($c, state[curType]);
         loadMore($c, state[curType]);
     }
     }
+});
+
+$nav.on('touchstart', function(e) {
+    var target = e.target || e.srcElement;
+
+    target.className = 'bytouch ' + target.className;
+}).on('touchend touchcancel', function() {
+    $nav.find('li').removeClass('bytouch');
 });
 });

@@ -20,9 +20,11 @@ mySwiper = new Swiper('.swiper-container', {
     lazyLoading: true,
     lazyLoading: true,
     pagination: '.swiper-pagination'
     pagination: '.swiper-pagination'
 });
 });
-
+$('#nav-tab').bind('contextmenu', function(e) {
+    return false;
+});
 navHammer = new Hammer(document.getElementById('nav-tab'));
 navHammer = new Hammer(document.getElementById('nav-tab'));
-navHammer.on('tap', function(e) {
+navHammer.on('tap pressup', function(e) {
     var $this = $(e.target).closest('li');
     var $this = $(e.target).closest('li');
 
 
     if ($this.hasClass('focus')) {
     if ($this.hasClass('focus')) {
@@ -33,4 +35,11 @@ navHammer.on('tap', function(e) {
     $contents.toggleClass('hide');
     $contents.toggleClass('hide');
 
 
     $(document).trigger('scroll'); //Trigger lazyLoad
     $(document).trigger('scroll'); //Trigger lazyLoad
+});
+$('#nav-tab').on('touchstart', function(e) {
+    var target = e.target || e.srcElement;
+
+    target.className = 'bytouch ' + target.className;
+}).on('touchend touchcancel', function() {
+    $navs.removeClass('bytouch');
 });
 });

@@ -281,8 +281,12 @@ writeSearch.bindWirteLocal($('#search-form'));
 //3.筛选无active时点击展开筛选面板
 //3.筛选无active时点击展开筛选面板
 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
 //5.当前active为筛选并且点击其他项时，隐藏筛选面板
 //5.当前active为筛选并且点击其他项时，隐藏筛选面板
+
+$listNav.bind('contextmenu', function(e) {
+    return false;
+});
 navHammer = new Hammer($listNav[0]);
 navHammer = new Hammer($listNav[0]);
-navHammer.on('tap', function(e) {
+navHammer.on('tap pressup', function(e) {
     var $this = $(e.target).closest('li'),
     var $this = $(e.target).closest('li'),
         nav,
         nav,
         navType,
         navType,
@@ -443,4 +447,11 @@ if ($brandHeader.length > 0) {
 }
 }
 
 
 //初始请求最新第一页数据
 //初始请求最新第一页数据
-search();
+search();
+$listNav.on('touchstart', function(e) {
+    var target = e.target || e.srcElement;
+
+    target.parentNode.parentNode.className = 'bytouch ' + target.parentNode.parentNode.className;
+}).on('touchend touchcancel', function() {
+    $listNav.find('li').removeClass('bytouch');
+});

@@ -263,8 +263,11 @@ lazyLoad($('.lazy'));
 //3.筛选无active时点击展开筛选面板
 //3.筛选无active时点击展开筛选面板
 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
 //5.当前active为筛选并且点击其他项时，隐藏筛选面板
 //5.当前active为筛选并且点击其他项时，隐藏筛选面板
+$listNav.bind('contextmenu', function(e) {
+    return false;
+});
 navHammer = new Hammer($listNav[0]);
 navHammer = new Hammer($listNav[0]);
-navHammer.on('tap', function(e) {
+navHammer.on('tap pressup', function(e) {
     var $this = $(e.target).closest('li'),
     var $this = $(e.target).closest('li'),
         nav,
         nav,
         navType,
         navType,
@@ -373,3 +376,11 @@ $(window).scroll(function() {
 
 
 //初始请求最新第一页数据
 //初始请求最新第一页数据
 search();
 search();
+
+$listNav.on('touchstart', function(e) {
+    var target = e.target || e.srcElement;
+
+    target.parentNode.parentNode.className = 'bytouch ' + target.parentNode.parentNode.className;
+}).on('touchend touchcancel', function() {
+    $listNav.find('li').removeClass('bytouch');
+});

@@ -285,6 +285,10 @@ $.ajax({
 });
 });
 lazyLoad($('.lazy'));
 lazyLoad($('.lazy'));
 
 
+$listNav.bind('contextmenu', function(e) {
+    return false;
+});
+
 //导航栏点击逻辑说明：
 //导航栏点击逻辑说明：
 //1.点击非active项时切换active状态
 //1.点击非active项时切换active状态
 //2.价格和折扣active状态时继续点击切换排序
 //2.价格和折扣active状态时继续点击切换排序
@@ -292,7 +296,7 @@ lazyLoad($('.lazy'));
 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
 //5.当前active为筛选并且点击其他项时，隐藏筛选面板
 //5.当前active为筛选并且点击其他项时，隐藏筛选面板
 navHammer = new Hammer($listNav[0]);
 navHammer = new Hammer($listNav[0]);
-navHammer.on('tap', function(e) {
+navHammer.on('tap pressup', function(e) {
     var $this = $(e.target).closest('li'),
     var $this = $(e.target).closest('li'),
         nav,
         nav,
         navType,
         navType,
@@ -385,3 +389,11 @@ $(window).scroll(function() {
 
 
 //初始请求最新第一页数据
 //初始请求最新第一页数据
 search();
 search();
+
+$listNav.on('touchstart', function(e) {
+    var target = e.target || e.srcElement;
+
+    target.parentNode.className = 'bytouch ' + target.parentNode.className;
+}).on('touchend touchcancel', function() {
+    $listNav.find('li').removeClass('bytouch');
+});

@@ -52,8 +52,14 @@
             &.focus {
             &.focus {
                 color: #000;
                 color: #000;
             }
             }
+
+            &.bytouch{
+                background:#eee;
+            }
         }
         }
 
 
+        
+
         span {
         span {
             display: block;
             display: block;
             width: 100%;
             width: 100%;

@@ -59,6 +59,7 @@
         height: 80rem / $pxConvertRem;
         height: 80rem / $pxConvertRem;
     }
     }
 
 
+    
     .guang-nav-item {
     .guang-nav-item {
         float: left;
         float: left;
         color: #ccc;
         color: #ccc;
@@ -68,7 +69,11 @@
 
 
         &.focus {
         &.focus {
             color: #000;
             color: #000;
-        }
+        }   
+    }
+    
+    .bytouch{
+        background:#eee;
     }
     }
 
 
     .info-list-container {
     .info-list-container {

@@ -25,7 +25,9 @@
             color: #000;
             color: #000;
         }
         }
     }
     }
-
+    .bytouch{
+        background:#eee;
+    }
     .star-nav {
     .star-nav {
         border-right: 1px solid #ccc;
         border-right: 1px solid #ccc;
     }
     }

@@ -43,7 +43,9 @@
             text-align: center;
             text-align: center;
             font-size: 14px;
             font-size: 14px;
         }
         }
-
+        .bytouch{
+            background:#eee;
+        }
         a {
         a {
             display: block;
             display: block;
             box-sizing: border-box;
             box-sizing: border-box;

@@ -193,6 +193,9 @@
             text-align: center;
             text-align: center;
             font-size: 14px;
             font-size: 14px;
         }
         }
+        .bytouch{
+            background:#eee;
+        }
 
 
         a {
         a {
             display: block;
             display: block;

@@ -34,7 +34,7 @@
     .list-nav {
     .list-nav {
         border-top:2px solid #fff;
         border-top:2px solid #fff;
         border-bottom:1px solid #e6e6e6;
         border-bottom:1px solid #e6e6e6;
-
+        
         > li {
         > li {
             float: left;
             float: left;
             width: 25%;
             width: 25%;
@@ -44,7 +44,9 @@
             font-size: 14px;
             font-size: 14px;
             color: #999;
             color: #999;
         }
         }
-
+        .bytouch{
+            background:#eee;
+        }
         a {
         a {
             display: inline-block;
             display: inline-block;
             box-sizing: border-box;
             box-sizing: border-box;