修改众多bug

@@ -73,7 +73,7 @@ class Bootstrap extends Bootstrap_Abstract
         $action = 'Index';
         $action = 'Index';
         
         
         // 二级域名
         // 二级域名
-        if (2 === $level) {
+        if (3 === $level) {
             $subDomain = strval($hostParts[0]);
             $subDomain = strval($hostParts[0]);
             switch (strtolower($subDomain)) {
             switch (strtolower($subDomain)) {
                 case 'www':  // 主站
                 case 'www':  // 主站

@@ -70,18 +70,14 @@ class BrandsModel {
         
         
         //获取静态内容（20141219-100447）
         //获取静态内容（20141219-100447）
         if($node){
         if($node){
-            $nodeContent = BrandData::getByNodeContent($node);
-            if(isset($nodeContent['code']) && $nodeContent['code'] === 200){
-                $result = $nodeContent['data'];
-                //接口返回html格式，非前端需要格式。
-            }
+            $nodeContent = HelperSearch::formatNodeContent($node);
+            $data['list']['leftContent'][]['picLink']['list'] = $nodeContent;
         }
         }
         
         
         return $data;
         return $data;
     }
     }
     
     
 
 
-    
     /**
     /**
      * 获取品牌首页banner条
      * 获取品牌首页banner条
      * @string $domain 品牌域名
      * @string $domain 品牌域名
@@ -103,24 +99,17 @@ class BrandsModel {
             $intro = BrandData::getBrandIntro($brandId, $uid);
             $intro = BrandData::getBrandIntro($brandId, $uid);
         }
         }
         $is_favorite = false;
         $is_favorite = false;
-        $logo = false;
         $shopName = false;
         $shopName = false;
-
-        do {
-            if (!isset($intro['data'])) {
-                break;
-            }
+        if(isset($intro['data'])){
             // 获取是否收藏
             // 获取是否收藏
             if ($intro['data']['is_favorite'] == 'Y') {
             if ($intro['data']['is_favorite'] == 'Y') {
                 $is_favorite = true;
                 $is_favorite = true;
             } elseif ($intro['data']['is_favorite'] == 'N') {
             } elseif ($intro['data']['is_favorite'] == 'N') {
                 $is_favorite = false;
                 $is_favorite = false;
             }
             }
-            // 获取品牌logo
-            $logo = Helpers::getImageUrl($intro['data']['brand_ico'], 80, 50);
             // 获取品牌名
             // 获取品牌名
             self::$shopName = $intro['data']['brand_name']; 
             self::$shopName = $intro['data']['brand_name']; 
-        } while (false);
+        }
         
         
         // 返回banner数据
         // 返回banner数据
         return array(
         return array(
@@ -128,21 +117,6 @@ class BrandsModel {
                 'bannerHeight' => '150',
                 'bannerHeight' => '150',
                 'coled' => $is_favorite,
                 'coled' => $is_favorite,
                 'banner' => $bannerImg
                 'banner' => $bannerImg
-                ),
-                'shopEntry' => array(
-                    'home' => self::$home,
-                    'logo' => $logo,
-                    'shopName' => self::$shopName,
-                    'sort' => array(
-                        array(
-                            'href' => '',
-                            'name' => 'T恤'
-                        ),
-                        array(
-                            'href' => '',
-                            'name' => '卫衣'
-                        )
-                    )
             )
             )
         );
         );
     }
     }
@@ -158,6 +132,8 @@ class BrandsModel {
                 $result['list'][$key]['src'] = $value['brand_sort_ico'];
                 $result['list'][$key]['src'] = $value['brand_sort_ico'];
             }
             }
         }
         }
+        $result['picTitle'] = '经典系列';
+        
         return $result;
         return $result;
     }
     }
 
 

@@ -58,10 +58,9 @@ class SaleModel
         $data['newSale']['saleTitle']['count'] = $data['newSale']['totalCount'];
         $data['newSale']['saleTitle']['count'] = $data['newSale']['totalCount'];
         
         
         
         
-         //获取广告位
+         //获取广告位数据
         $nodeContent = HelperSearch::formatNodeContent($special['left_ad_code']);
         $nodeContent = HelperSearch::formatNodeContent($special['left_ad_code']);
-        $data['newSale']['leftContent'][]['picLink'][] = $nodeContent;
-        
+        $data['newSale']['leftContent'][]['picLink']['list'] = $nodeContent;
         
         
         return $data;
         return $data;
     }
     }

@@ -55,6 +55,7 @@ class IndexController extends WebAction
         }
         }
         //传品牌ID参数
         //传品牌ID参数
         $condition['brand'] = $brandId;
         $condition['brand'] = $brandId;
+        
         //获取性别数据
         //获取性别数据
         $gender = $this->get('gender') ? ($this->get('gender') == '2,3' ? 2 : 1) : (!isset($_COOKIE['_Gender']) ? '3' : ($_COOKIE['_Gender']=='2,3' ? 2 : 1));
         $gender = $this->get('gender') ? ($this->get('gender') == '2,3' ? 2 : 1) : (!isset($_COOKIE['_Gender']) ? '3' : ($_COOKIE['_Gender']=='2,3' ? 2 : 1));
         $condition['gender'] = $gender;
         $condition['gender'] = $gender;

@@ -13,15 +13,13 @@ class SaleController extends WebAction
     public function indexAction() 
     public function indexAction() 
     {
     {
         //获取专区ID
         //获取专区ID
-        $specialsaleId = $this->Param('specialsaleId');
+        $specialsaleId = $this->param('specialsaleId');
         $specialsaleId = 1; //测试数据
         $specialsaleId = 1; //测试数据
         $specialInfo = SaleData::getSpecial($specialsaleId);
         $specialInfo = SaleData::getSpecial($specialsaleId);
         $special = $specialInfo['data'];
         $special = $specialInfo['data'];
-//        if (empty($specialsale_id)) {
-//            $specialsale_id = str_replace('specialsale', '', explode('.', $_SERVER['HTTP_HOST'])[0]);
-//        }
+        
         //获取促销ID
         //获取促销ID
-        $promotion = $this->Param('promotion');
+        $promotion = $this->param('promotion');
         
         
         //专区ID和促销ID都为空时，跳转到主页
         //专区ID和促销ID都为空时，跳转到主页
         if (empty($specialsaleId) && empty($promotion)) {
         if (empty($specialsaleId) && empty($promotion)) {
@@ -64,6 +62,8 @@ class SaleController extends WebAction
         //传促销id
         //传促销id
         if(!empty($special['ispromotion'])){
         if(!empty($special['ispromotion'])){
             //$condition['promotion'] = $special['ispromotion'];
             //$condition['promotion'] = $special['ispromotion'];
+        }else{
+            $condition['promotion'] = $promotion;
         }
         }
         
         
         //获取性别数据
         //获取性别数据
@@ -108,7 +108,6 @@ class SaleController extends WebAction
         $params = array_filter($params);
         $params = array_filter($params);
         
         
         $data = Product\SaleModel::getSaleSearchData($params, $options, $specialInfo);
         $data = Product\SaleModel::getSaleSearchData($params, $options, $specialInfo);
-        
         $cate = array('boys', 'girls', 'kids', 'lifestyle');
         $cate = array('boys', 'girls', 'kids', 'lifestyle');
         $this->setWebNavHeader($cate[$gender - 1]);
         $this->setWebNavHeader($cate[$gender - 1]);
         //渲染模板
         //渲染模板