修改注释

@@ -1085,7 +1085,7 @@ class HelperSearch
     }
     }
     
     
     //组织静态资源数据格式
     //组织静态资源数据格式
-    public static function formatNodeContent($code)
+    public static function getNodeContent($code)
     {
     {
         $nodeContent = BrandData::getByNodeContent($code);
         $nodeContent = BrandData::getByNodeContent($code);
             if (isset($nodeContent['code']) && $nodeContent['code'] === 200) {
             if (isset($nodeContent['code']) && $nodeContent['code'] === 200) {
@@ -1102,6 +1102,7 @@ class HelperSearch
                         $result[$key]['href'] = $vo;
                         $result[$key]['href'] = $vo;
                         $result[$key]['src'] = $img[1][$key];
                         $result[$key]['src'] = $img[1][$key];
                 }
                 }
+                
                return $result;
                return $result;
             }
             }
     }
     }

@@ -71,7 +71,7 @@ class Bootstrap extends Bootstrap_Abstract
         $controller = 'Index';
         $controller = 'Index';
         $action = 'Index';
         $action = 'Index';
         // 二级域名
         // 二级域名
-        if (2 === $level) {
+        if (3 === $level) {
             $url = strtolower($dispatcher->getRequest()->getRequestUri());
             $url = strtolower($dispatcher->getRequest()->getRequestUri());
             if(empty($url) || $url == '/index' || $url == '/') {
             if(empty($url) || $url == '/index' || $url == '/') {
                 $urlAction = '/index';
                 $urlAction = '/index';

@@ -40,7 +40,7 @@ class BrandsModel
 
 
         //获取静态内容
         //获取静态内容
         if ($options['node']) {
         if ($options['node']) {
-            $nodeContent = HelperSearch::formatNodeContent($options['node']);
+            $nodeContent = HelperSearch::getNodeContent($options['node']);
             $data['leftContent'][]['picLink']['list'] = $nodeContent;
             $data['leftContent'][]['picLink']['list'] = $nodeContent;
         }
         }
 
 

@@ -35,14 +35,16 @@ class SaleModel
         $data = HelperSearch::getList($result, $searchCondition['options']);
         $data = HelperSearch::getList($result, $searchCondition['options']);
         
         
         //组织sale数据
         //组织sale数据
+        $special = array();
         if (isset($specialInfo['data']) && !empty($specialInfo['data']['banner_img'])) {
         if (isset($specialInfo['data']) && !empty($specialInfo['data']['banner_img'])) {
             $banner = json_decode($specialInfo['data']['banner_img'], true);
             $banner = json_decode($specialInfo['data']['banner_img'], true);
             foreach ($banner as $k => $v) {
             foreach ($banner as $k => $v) {
                 $v['img'] = Images::getSourceUrl($v['img'], 'couponImg');
                 $v['img'] = Images::getSourceUrl($v['img'], 'couponImg');
                 $specialInfo['data']['banner'][] = $v;
                 $specialInfo['data']['banner'][] = $v;
             }
             }
-             $special = $specialInfo['data'];
+            $special = $specialInfo['data'];
         }
         }
+        
         //Sale首页 banner数据
         //Sale首页 banner数据
         $data['saleBanner']['bannerHeight'] = $special['banner'][0]['height'];
         $data['saleBanner']['bannerHeight'] = $special['banner'][0]['height'];
         $data['saleBanner']['img'] = $special['banner'][0]['img'];
         $data['saleBanner']['img'] = $special['banner'][0]['img'];
@@ -51,7 +53,7 @@ class SaleModel
         
         
          //获取广告位数据
          //获取广告位数据
         if (isset($special['left_ad_code'])) {
         if (isset($special['left_ad_code'])) {
-            $nodeContent = HelperSearch::formatNodeContent($special['left_ad_code']);
+            $nodeContent = HelperSearch::getNodeContent($special['left_ad_code']);
             $data['leftContent'][]['picLink']['list'] = $nodeContent;
             $data['leftContent'][]['picLink']['list'] = $nodeContent;
         }
         }
         
         

@@ -32,7 +32,7 @@ class SaleController extends WebAction
         if(!empty($special['brand_id'])){
         if(!empty($special['brand_id'])){
             $condition['brand'] = $special['brand_id'];
             $condition['brand'] = $special['brand_id'];
         }
         }
-        //传促销id
+        //传促销id,促销id为空时传专区id
         if(!empty($special['ispromotion'])){
         if(!empty($special['ispromotion'])){
             $condition['promotion'] = $special['ispromotion'];
             $condition['promotion'] = $special['ispromotion'];
         }else{
         }else{
@@ -40,7 +40,6 @@ class SaleController extends WebAction
         }
         }
         
         
         $options = array(
         $options = array(
-            'specialsale_id' => 'Y',
             'controller' => $this->_request->controller,
             'controller' => $this->_request->controller,
             'reviewNum' => 6
             'reviewNum' => 6
         );
         );