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

@@ -164,6 +164,7 @@
 {{#if searchPage}}
 {{#if searchPage}}
 <script>
 <script>
     seajs.use('js/index/search');
     seajs.use('js/index/search');
+    seajs.use('js/index/footer');
 </script>
 </script>
 {{/if}}
 {{/if}}
 
 

@@ -117,7 +117,7 @@ class IndexController extends AbstractAction
         $data['showDownloadApp'] = true;
         $data['showDownloadApp'] = true;
         // 从搜索页过来的，显示搜索框, 和进入品牌引导信息
         // 从搜索页过来的，显示搜索框, 和进入品牌引导信息
         if ($from === 'search') {
         if ($from === 'search') {
-            $data['goodList'] = Product\ListModel::getBrandData($condition, $title);
+            $data['goodList'] = array();
             $data['goodList']['brandWay'] = false;
             $data['goodList']['brandWay'] = false;
             $data['goodList']['search']['default'] = $query;
             $data['goodList']['search']['default'] = $query;
             $data['goodList']['search']['url'] = Helpers::url('', null, 'search');
             $data['goodList']['search']['url'] = Helpers::url('', null, 'search');
@@ -125,7 +125,7 @@ class IndexController extends AbstractAction
         // 品牌一览过来的展示品牌介绍和LOGO
         // 品牌一览过来的展示品牌介绍和LOGO
         else {
         else {
             $data['brandHome'] = Product\ListModel::getBrandIntro($brandIds[0], $uid, $title);
             $data['brandHome'] = Product\ListModel::getBrandIntro($brandIds[0], $uid, $title);
-            $data['goodList'] = Product\ListModel::getBrandData($condition, $title);
+            $data['goodList'] = array();
         }
         }
         $data['goodList'] += $condition;
         $data['goodList'] += $condition;