Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4

@@ -218,6 +218,7 @@ class SearchController extends AbstractAction
 
 
             /* 过滤请求参数 */
             /* 过滤请求参数 */
             $condition = filter_input_array(INPUT_GET, array(
             $condition = filter_input_array(INPUT_GET, array(
+                'shop_id' => FILTER_DEFAULT,
                 'query' => FILTER_DEFAULT,
                 'query' => FILTER_DEFAULT,
                 'specialsale_id' => FILTER_DEFAULT,
                 'specialsale_id' => FILTER_DEFAULT,
                 'promotion' => FILTER_DEFAULT,
                 'promotion' => FILTER_DEFAULT,
@@ -233,6 +234,10 @@ class SearchController extends AbstractAction
                 'gender' => FILTER_DEFAULT,
                 'gender' => FILTER_DEFAULT,
                 'p_d' => FILTER_DEFAULT,
                 'p_d' => FILTER_DEFAULT,
                 'page' => FILTER_VALIDATE_INT,), false);
                 'page' => FILTER_VALIDATE_INT,), false);
+
+            if(!empty($condition['shop_id'])){
+                $condition['shop'] = empty($condition['shop_id']);
+            }
             // 转义分类
             // 转义分类
             if (isset($condition['sort'])) {
             if (isset($condition['sort'])) {
                 $condition['sort'] = rawurldecode($condition['sort']);
                 $condition['sort'] = rawurldecode($condition['sort']);