Merge branch 'feature/web-list' of git.dev.yoho.cn:web/yohobuy into feature/web-list

@@ -24,7 +24,7 @@ class BrandsModel {
      * 搜索品牌数据
      * 搜索品牌数据
      *
      *
      * @param $condition array
      * @param $condition array
-     *            搜索数据的条件
+     * 搜索数据的条件
      * @param $options array            
      * @param $options array            
      * @return array
      * @return array
      */
      */
@@ -32,8 +32,11 @@ class BrandsModel {
 
 
         // 调用商品搜索接口
         // 调用商品搜索接口
         $data = SearchData::searchElasticByCondition($condition);
         $data = SearchData::searchElasticByCondition($condition);
+        
         //获取品牌banner数据
         //获取品牌banner数据
         $banner = self::getBannerByDomain($domain, $brandId, $uid = '');
         $banner = self::getBannerByDomain($domain, $brandId, $uid = '');
+        $brandName = self::$shopName;
+        $options['brandName'] = $brandName;
         
         
         if (isset($data['code']) && $data['code'] === 200) {
         if (isset($data['code']) && $data['code'] === 200) {
             //获取分类列表数据
             //获取分类列表数据
@@ -43,18 +46,15 @@ class BrandsModel {
             if (isset($classes['code']) && $classes['code'] === 200) {
             if (isset($classes['code']) && $classes['code'] === 200) {
                 $data['data']['filter']['group_sort'] = $classes['data']['sort'];
                 $data['data']['filter']['group_sort'] = $classes['data']['sort'];
             }
             }
-
-            $brandName = self::$shopName;
-            $options['brandName'] = $brandName;
-           
             
             
             //用户浏览记录
             //用户浏览记录
             
             
+            
             // 组织模板数据
             // 组织模板数据
             $list = HelperSearch::getList($data, $options);
             $list = HelperSearch::getList($data, $options);
             
             
             //合并商品搜索数据与品牌banner数据
             //合并商品搜索数据与品牌banner数据
-            $data = array_merge_recursive($data, $banner);
+            $list = array_merge_recursive($list,$banner);
             
             
             $data = array(
             $data = array(
                 //初始化js
                 //初始化js
@@ -65,19 +65,10 @@ class BrandsModel {
             $data = array();
             $data = array();
         }
         }
 
 
-        
-
-
         //获取品牌系列数据
         //获取品牌系列数据
         $adNav = self::getAdNav($condition['brand']);
         $adNav = self::getAdNav($condition['brand']);
         $data['list']['leftContent'][] = array('picLink' => $adNav);
         $data['list']['leftContent'][] = array('picLink' => $adNav);
 
 
-
-
-
-
-
-
         return $data;
         return $data;
     }
     }
 
 
@@ -123,7 +114,6 @@ class BrandsModel {
 
 
         // 返回banner数据
         // 返回banner数据
         return array(
         return array(
-            'list' => array(
                 'brandBanner' => array(
                 'brandBanner' => array(
                     'bannerHeight' => '150',
                     'bannerHeight' => '150',
                     'coled' => $is_favorite,
                     'coled' => $is_favorite,
@@ -144,8 +134,7 @@ class BrandsModel {
                         )
                         )
                     )
                     )
                 )
                 )
-            )
-        );
+            );
     }
     }
 
 
     //获取品牌系列数据
     //获取品牌系列数据