基础模板 多品牌无banner

@@ -44,6 +44,7 @@ class IndexController extends WebAction
                     if (!empty($shopIntro['shopTemplateType']) && $shopIntro['shopTemplateType'] === 1) {
                         //基础模板多个品牌
                         $result['shopTemplateType'] = $shopIntro['shopTemplateType'];
+                        $result['multBrandShopType'] = $shopIntro['multBrandShopType'];
                         $result['shopId'] = $shopIntro['shopId'];
                         break;
                     }
@@ -74,7 +75,13 @@ class IndexController extends WebAction
 
         //传品牌ID参数
         $condition = array();
-        $condition['brand'] = isset($result['brandId']) ? $result['brandId'] : '';
+        if (!empty($result['multBrandShopType']) && !empty($result['shopId']) && $result['multBrandShopType'] === 2) {
+            //多品牌按shop搜索
+            $condition['shop'] = $result['shopId'];
+        } else {
+            $condition['brand'] = isset($result['brandId']) ? $result['brandId'] : '';
+        }
+
         $order = $this->get('order');
         if (empty($order)) {
             $condition['order'] = 'brand_desc';
@@ -113,6 +120,11 @@ class IndexController extends WebAction
         }else{
             $arr = array('skn'=>array());
         }
+        
+        if (!empty($result['multBrandShopType']) && !empty($result['shopId']) && $result['multBrandShopType'] === 2) {
+            //多品牌无banner
+            $data['brandBanner'] = array();
+        }
 
         $seo = $data['seo'];
         $data = array(