修改 折

@@ -56,7 +56,7 @@ class HelperSearch
             );
             );
             self::$listNav[1] = array(
             self::$listNav[1] = array(
                 'href' => '',
                 'href' => '',
-                'name' => '列表'
+                'name' => $options['action'] == 'new' ? '新品到着' : '列表'
             );
             );
         }
         }
     }
     }
@@ -1005,10 +1005,12 @@ class HelperSearch
             $query['p_d'] = $k;
             $query['p_d'] = $k;
             $list[$k]['href'] = self::buildUrl($query);
             $list[$k]['href'] = self::buildUrl($query);
             $list[$k]['active'] = isset($params['p_d']) && $params['p_d'] == $k ? true : false;
             $list[$k]['active'] = isset($params['p_d']) && $params['p_d'] == $k ? true : false;
+            $list[$k]['name'] = $v['name'] . '折';
         }
         }
         $result = array(
         $result = array(
             'list' => array_values($list)
             'list' => array_values($list)
         );
         );
+        //print_r($result);
         return $result;
         return $result;
     }
     }
 
 
@@ -1208,8 +1210,8 @@ class HelperSearch
     {
     {
         // 根据品牌Id获取品牌banner图
         // 根据品牌Id获取品牌banner图
         $bannerImg = Helpers::getImageUrl($brandBanner, '', 150);
         $bannerImg = Helpers::getImageUrl($brandBanner, '', 150);
-        $brandHome = Helpers::url('/product/index/brand', '', $brand['brand_domain']);
-        $brandIntro = Helpers::url('/product/index/brandIntro', '', $brand['brand_domain']);
+        $brandHome = Helpers::url('', '', $brand['brand_domain']);
+        $brandIntro = Helpers::url('/about', '', $brand['brand_domain']);
         $is_favorite = false;
         $is_favorite = false;
         if(isset($brand['is_favorite'])){
         if(isset($brand['is_favorite'])){
             // 获取是否收藏
             // 获取是否收藏

@@ -41,13 +41,15 @@ class SaleModel
                 $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'];
         $data['saleTitle']['name'] = '全部商品';
         $data['saleTitle']['name'] = '全部商品';
         $data['saleTitle']['count'] = $data['totalCount'];
         $data['saleTitle']['count'] = $data['totalCount'];
+        }
+        
+        
         
         
          //获取广告位数据
          //获取广告位数据
         if (isset($special['left_ad_code'])) {
         if (isset($special['left_ad_code'])) {

@@ -62,7 +62,7 @@ class IndexController extends WebAction
     }
     }
     
     
     //品牌介绍页
     //品牌介绍页
-    public function brandAboutAction()
+    public function aboutAction()
     {
     {
         //品牌域名
         //品牌域名
         $domain = $this->param('named');
         $domain = $this->param('named');

@@ -15,7 +15,7 @@ class SaleController extends WebAction
     {
     {
         //获取专区ID
         //获取专区ID
         $specialsaleId = $this->get('specialsale_id');
         $specialsaleId = $this->get('specialsale_id');
-
+        
         //获取促销ID
         //获取促销ID
         $promotion = $this->get('promotion');
         $promotion = $this->get('promotion');
         //专区ID和促销ID都为空时，跳转到主页
         //专区ID和促销ID都为空时，跳转到主页