取消注释

@@ -105,14 +105,13 @@ class HelperSearch
         //分类
         //分类
         $result['leftContent'][]['allSort'] = isset($filter['group_sort']) ? self::groupSort($filter['group_sort'], $options) : array();
         $result['leftContent'][]['allSort'] = isset($filter['group_sort']) ? self::groupSort($filter['group_sort'], $options) : array();
         //一周新品上架
         //一周新品上架
-        //$result['leftContent'][]['newSales'] = self::recentShelve($filter['recent']);
+        $result['leftContent'][]['newSales'] = isset($filter['recent']) ? self::recentShelve($filter['recent']) : array();
         //全部折扣
         //全部折扣
-        //$result['leftContent'][]['allDiscount'] = self::getDiscount($filter['discount']);
+        $result['leftContent'][]['allDiscount'] = isset($filter['discount']) ? self::getDiscount($filter['discount']) : array();
         //总记录数
         //总记录数
         $result['totalCount'] = $data['data']['total'];
         $result['totalCount'] = $data['data']['total'];
         //分页
         //分页
         $result['pager'] = self::pager($result['totalCount'],$options['viewNum']);
         $result['pager'] = self::pager($result['totalCount'],$options['viewNum']);
-        //echo $result['pager']; exit;
         //选中条件
         //选中条件
         $result['filters']['checkedConditions']['conditions'] = self::getSelected();
         $result['filters']['checkedConditions']['conditions'] = self::getSelected();
         $result['pathNav'] = self::$listnav;
         $result['pathNav'] = self::$listnav;

@@ -46,13 +46,16 @@ class BrandsModel {
 
 
             $brandName = self::$shopName;
             $brandName = self::$shopName;
             $options['brandName'] = $brandName;
             $options['brandName'] = $brandName;
-            //合并商品搜索数据与品牌banner数据
-            $data = array_merge_recursive($data, $banner);
+           
             
             
             //用户浏览记录
             //用户浏览记录
             
             
             // 组织模板数据
             // 组织模板数据
             $list = HelperSearch::getList($data, $options);
             $list = HelperSearch::getList($data, $options);
+            
+            //合并商品搜索数据与品牌banner数据
+            $data = array_merge_recursive($data, $banner);
+            
             $data = array(
             $data = array(
                 //初始化js
                 //初始化js
                 'productListPage' => true,
                 'productListPage' => true,