Authored by ccbikai

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

@@ -12,9 +12,18 @@ var $filter; @@ -12,9 +12,18 @@ var $filter;
12 12
13 var fCbFn, hCbFn; //筛选和关闭的回调 13 var fCbFn, hCbFn; //筛选和关闭的回调
14 14
  15 +var missStatus; //是否忽略选中状态
  16 +
15 //隐藏筛选界面 17 //隐藏筛选界面
16 function hideFilter() { 18 function hideFilter() {
17 $filter.addClass('hide'); 19 $filter.addClass('hide');
  20 +
  21 + if (missStatus) {
  22 +
  23 + //重置一级筛选项选中状态
  24 + $filter.find('.classify-item.active').removeClass('active');
  25 + $filter.find('.classify-item:first-child').addClass('active');
  26 + }
18 } 27 }
19 28
20 //显示筛选界面 29 //显示筛选界面
@@ -71,15 +80,23 @@ function subClassifyTapEvt($this) { @@ -71,15 +80,23 @@ function subClassifyTapEvt($this) {
71 } 80 }
72 81
73 hideFilter(); 82 hideFilter();
  83 +
  84 + //重置选中状态
  85 + if (missStatus) {
  86 + $this.removeClass('chosed');
  87 + $sub.children(':first-child').addClass('chosed');
  88 + }
74 } 89 }
75 90
76 //初始化筛选 91 //初始化筛选
77 -function initFilter(cb) { 92 +function initFilter(opt) {
78 var filterHammer; 93 var filterHammer;
79 94
80 //注册回调 95 //注册回调
81 - fCbFn = cb.fCbFn;  
82 - hCbFn = cb.hCbFn; 96 + fCbFn = opt.fCbFn;
  97 + hCbFn = opt.hCbFn;
  98 +
  99 + missStatus = opt.missStatus;
83 100
84 101
85 $filter = $('.filter-mask'); 102 $filter = $('.filter-mask');
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <div class="ps-list-page ps-page yoho-page"> 2 <div class="ps-list-page ps-page yoho-page">
3 {{# ps}} 3 {{# ps}}
4 <ul id="nav-tab" class="nav-tab clearfix"> 4 <ul id="nav-tab" class="nav-tab clearfix">
5 - <li class="star-nav focus">推荐</li>  
6 - <li class="plus-nav">ALL</li> 5 + <li class="star-nav focus">设计师</li>
  6 + <li class="plus-nav">经典潮牌</li>
7 </ul> 7 </ul>
8 <div id="ps-content" class="ps-content"> 8 <div id="ps-content" class="ps-content">
9 <ul class="star-content content"> 9 <ul class="star-content content">