Authored by zhangxiaoru

merge feature/brandsTree

@@ -40,7 +40,7 @@ const handleBrandList = origin => { @@ -40,7 +40,7 @@ const handleBrandList = origin => {
40 let brands = []; 40 let brands = [];
41 41
42 if (_.size(value) <= 0) { 42 if (_.size(value) <= 0) {
43 - return false; 43 + return;
44 } 44 }
45 45
46 if (key === '0~9') { 46 if (key === '0~9') {
@@ -11,8 +11,8 @@ var $nav = $('.category-nav'), @@ -11,8 +11,8 @@ var $nav = $('.category-nav'),
11 $search = $('#search-input'), 11 $search = $('#search-input'),
12 $categoryContainer = $('.category-container'), 12 $categoryContainer = $('.category-container'),
13 $contents = $categoryContainer.children('.content'), 13 $contents = $categoryContainer.children('.content'),
14 - $subLevelItem = $categoryContainer.find('.sub-level li'),  
15 - $primaryItem = $categoryContainer.find('.primary-level li'); 14 + $subLevelItem = $categoryContainer.find('.sub-level li');
  15 + // $primaryItem = $categoryContainer.find('.primary-level li');
16 16
17 require('../common'); 17 require('../common');
18 18
@@ -91,12 +91,12 @@ $categoryContainer.on('click', function(e) { @@ -91,12 +91,12 @@ $categoryContainer.on('click', function(e) {
91 } 91 }
92 }); 92 });
93 93
94 -$categoryContainer.find('.primary-level').on('touchstart touchend touchcancel', 'li', function() {  
95 - $primaryItem.removeClass('highlight');  
96 - $(this).addClass('highlight');  
97 -}).on('touchend touchcancel', 'li', function() {  
98 - $(this).removeClass('highlight');  
99 -}); 94 +// $categoryContainer.find('.primary-level').on('touchstart touchend touchcancel', 'li', function() {
  95 +// $primaryItem.removeClass('highlight');
  96 +// $(this).addClass('highlight');
  97 +// }).on('touchend touchcancel', 'li', function() {
  98 +// $(this).removeClass('highlight');
  99 +// });
100 100
101 $categoryContainer.find('.sub-level').on('touchstart', 'li', function() { 101 $categoryContainer.find('.sub-level').on('touchstart', 'li', function() {
102 $subLevelItem.removeClass('highlight'); 102 $subLevelItem.removeClass('highlight');