搜索用品牌域名访问

@@ -244,6 +244,8 @@ class SearchModel
                     if (isset($val['brand_id'])) {
                         $shopSort = SearchData::getClassesData(array('brand' => $val['brand_id']));
                     }
+                    //用品牌域名访问
+                    $val['brand_domain'] = $data['shop']['brand_domain'];
                     $data['shopData'][] = array(
                         'shop' => $val,
                         'shopSort' => empty($shopSort['data']['sort']) ? array() : $shopSort['data']['sort']

@@ -17,11 +17,6 @@ class IndexController extends WebAction
      */
     public function brandAction()
     {
-        $shopId = $this->get('shopId', 0);
-        if (!empty($shopId)) {
-            $this->shopHome($shopId);
-            exit(0);
-        }
         //品牌域名,没有获取到品牌域名的跳转首页
         $domain = $this->param('named');
         if (empty($domain)) {
@@ -36,6 +31,7 @@ class IndexController extends WebAction
         $type = intval(isset($result['type']) ? $result['type'] : '');
         switch ($type) {
             case 1:
+                $shopId = intval($this->get('shopId', 0));
                 if (empty($shopId)) {
                     //无单品店有多品店：1--->搜索页
                     $this->go('http://search.yohobuy.com/?query=' . $domain);