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

@@ -151,6 +151,9 @@ class SearchController extends AbstractAction
 
 
         // 右下角的购物车链接
         // 右下角的购物车链接
         $data['goodList']['cartUrl'] = Helpers::url('/cart/index/index', null);
         $data['goodList']['cartUrl'] = Helpers::url('/cart/index/index', null);
+        
+        // 显示底部悬浮下载
+        $data['showDownloadApp'] = true;
 
 
 //        // 查询数据
 //        // 查询数据
 //        if (!isset($condition['query'])) {
 //        if (!isset($condition['query'])) {
@@ -219,6 +222,9 @@ class SearchController extends AbstractAction
             $type = $this->get('type', '');
             $type = $this->get('type', '');
             $order = $this->get('order', 0);
             $order = $this->get('order', 0);
             $condition['order'] = Helpers::transOrder($order, $type);
             $condition['order'] = Helpers::transOrder($order, $type);
+            
+            // 过滤掉值为空的条件
+            $condition = array_filter($condition);
 
 
 //            /* 模糊搜索关键词 */
 //            /* 模糊搜索关键词 */
 //            if (isset($condition['query'])) {
 //            if (isset($condition['query'])) {