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

@@ -5,8 +5,9 @@
  * @date: 2015/10/19
  * @date: 2015/10/19
  */
  */
 
 
-var $ = require('jquery'),
-    Hammer = require('yoho.hammer');
+var $ = require('jquery');
+
+// Hammer = require('yoho.hammer');
 
 
 var $filter;
 var $filter;
 
 
@@ -112,7 +113,8 @@ function subClassifyTapEvt($this) {
 
 
 //初始化筛选
 //初始化筛选
 function initFilter(opt) {
 function initFilter(opt) {
-    var filterHammer;
+
+    // var filterHammer;
 
 
     //注册回调
     //注册回调
     fCbFn = opt.fCbFn;
     fCbFn = opt.fCbFn;
@@ -125,8 +127,8 @@ function initFilter(opt) {
 
 
     $filter = $('.filter-mask');
     $filter = $('.filter-mask');
 
 
-    filterHammer = new Hammer($filter[0]);
-    filterHammer.on('tap', function(e) {
+    // filterHammer = new Hammer($filter[0]);
+    $filter.on('touchend', function(e) {
         var $this = $(e.target),
         var $this = $(e.target),
             $cur;
             $cur;
 
 
@@ -145,7 +147,7 @@ function initFilter(opt) {
                 //tap classify
                 //tap classify
                 $cur = $this.closest('.classify-item');
                 $cur = $this.closest('.classify-item');
 
 
-                e.srcEvent.stopPropagation();
+                e.stopPropagation();
 
 
                 classifyTapEvt($cur);
                 classifyTapEvt($cur);
             }
             }