Merge branch 'feature/srchactshr' into release/5.0.0

@@ -33,7 +33,7 @@ var $input = $('#search-input input'),
     $buriedpoint = $('.buriedpoint'),
     $buriedpoint = $('.buriedpoint'),
     $search = $('#search');
     $search = $('#search');
 
 
-var shopId,sort,brand,outlets,app_type;
+var shopId,sort,brand,outlets,app_type,promotion;
 
 
 //默认筛选条件
 //默认筛选条件
 var defaultOpt = require('./query-param');
 var defaultOpt = require('./query-param');
@@ -155,7 +155,7 @@ sort = getQueryString('sort');
 outlets = getQueryString('outlets');
 outlets = getQueryString('outlets');
 age_level = getQueryString('ageLevel');
 age_level = getQueryString('ageLevel');
 app_type = getQueryString('app_type');
 app_type = getQueryString('app_type');
-
+promotion = getQueryString('promotion');
 /**
 /**
  * 筛选注册的回调，筛选子项点击后逻辑
  * 筛选注册的回调，筛选子项点击后逻辑
  * 需要执行search的场景：1.点选筛选项；2.relaod为true时切换导航；3.下拉加载
  * 需要执行search的场景：1.点选筛选项；2.relaod为true时切换导航；3.下拉加载
@@ -293,6 +293,10 @@ function search(opt) {
         params.app_type = app_type;
         params.app_type = app_type;
     }
     }
 
 
+    if (promotion) {
+        params.promotion = promotion;
+    }
+
     $.extend(setting, defaultOpt, params);
     $.extend(setting, defaultOpt, params);
 
 
     searching = true;
     searching = true;