brandshop access

@@ -434,7 +434,7 @@ class ListModel
     public static function getBrandShops($brandId)
     {
         $result = array();
-        $brandShop = ShopData::getShopByBrandId(1559);
+        $brandShop = ShopData::getShopByBrandId($brandId);
         if (isset($brandShop['code']) && $brandShop['code'] && !empty($brandShop['data'])) {
             foreach ($brandShop['data'] as $key => $val) {
                 $result[$key]['url'] = Helpers::url('/product/index/brand/', array('shop_id', $val['shop_id']));

@@ -133,7 +133,6 @@ class IndexController extends AbstractAction
         }
         /* 品牌域名参数 @see Bootstrap.php */
         $domain = $this->param('named');
-//        $domain = 'andybrier';
         if (empty($domain)) {
             $this->go(SITE_MAIN);
         }
@@ -142,6 +141,7 @@ class IndexController extends AbstractAction
         // 存标题信息
         $title = '';
         $brandLogo = Product\ListModel::getBrandLogoByDomain($domain, $title);
+//        print_r($brandLogo); exit;
         //无店铺：0--->品牌页 无单品店有多品店：1--->搜索页 有单品店：2--->店铺页面
 //        $brandLogo['shopId'] = 672;
 //        $brandLogo['type'] = 2;
@@ -155,9 +155,6 @@ class IndexController extends AbstractAction
         }
         //获取品牌店铺信息
         $brandShop = $this->brandShop($brandId);
-        if (!empty($brandShop)) {
-            $brandLogo = $brandShop;
-        }
         /* 搜索框相关 */
         $from = $this->get('from');
         $query = $this->get('query');
@@ -228,11 +225,11 @@ class IndexController extends AbstractAction
         $data = array();
         $data['goodListPage'] = true;
         $data['showDownloadApp'] = true;
-        // 从搜索页过来的，显示搜索框, 和进入品牌引导信息
-        if ($from === 'search') {
+        // 从搜索页过来的，显示搜索框, 和进入品牌引导信息 或者品牌关联多店铺
+        if ($from === 'search' || !empty($brandShop)) {
             $data['goodList'] = array();
             //$data['goodList']['brandWay'] = \Product\ListModel::getBrandLogoByIds($brandId, $title);
-            $data['goodList']['brandWay'] = $brandLogo;
+            $data['goodList']['brandWay'] = $brandShop ? $brandShop : $brandLogo;
             $data['goodList']['search']['default'] = $query;
             $data['goodList']['search']['url'] = Helpers::url('', null, 'search');
         } // 品牌一览过来的展示品牌介绍和LOGO