修改Brands.php

@@ -32,6 +32,9 @@ class BrandsModel {
 
 
         // 调用商品搜索接口
         // 调用商品搜索接口
         $data = SearchData::searchElasticByCondition($condition);
         $data = SearchData::searchElasticByCondition($condition);
+        //获取品牌banner数据
+        $banner = self::getBannerByDomain($domain, $brandId, $uid = '');
+        
         if (isset($data['code']) && $data['code'] === 200) {
         if (isset($data['code']) && $data['code'] === 200) {
             //获取分类列表数据
             //获取分类列表数据
             $param = array();
             $param = array();
@@ -43,8 +46,11 @@ 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);
             $data = array(
             $data = array(
@@ -56,9 +62,7 @@ class BrandsModel {
             $data = array();
             $data = array();
         }
         }
 
 
-        //获取品牌数据
-        $banner = self::getBannerByDomain($domain, $brandId, $uid = '');
-        $data = array_merge_recursive($data, $banner);
+        
 
 
 
 
         //获取品牌系列数据
         //获取品牌系列数据