Authored by yangyang

修改 折

@@ -56,7 +56,7 @@ class HelperSearch @@ -56,7 +56,7 @@ class HelperSearch
56 ); 56 );
57 self::$listNav[1] = array( 57 self::$listNav[1] = array(
58 'href' => '', 58 'href' => '',
59 - 'name' => '列表' 59 + 'name' => $options['action'] == 'new' ? '新品到着' : '列表'
60 ); 60 );
61 } 61 }
62 } 62 }
@@ -1005,10 +1005,12 @@ class HelperSearch @@ -1005,10 +1005,12 @@ class HelperSearch
1005 $query['p_d'] = $k; 1005 $query['p_d'] = $k;
1006 $list[$k]['href'] = self::buildUrl($query); 1006 $list[$k]['href'] = self::buildUrl($query);
1007 $list[$k]['active'] = isset($params['p_d']) && $params['p_d'] == $k ? true : false; 1007 $list[$k]['active'] = isset($params['p_d']) && $params['p_d'] == $k ? true : false;
  1008 + $list[$k]['name'] = $v['name'] . '折';
1008 } 1009 }
1009 $result = array( 1010 $result = array(
1010 'list' => array_values($list) 1011 'list' => array_values($list)
1011 ); 1012 );
  1013 + //print_r($result);
1012 return $result; 1014 return $result;
1013 } 1015 }
1014 1016
@@ -1208,8 +1210,8 @@ class HelperSearch @@ -1208,8 +1210,8 @@ class HelperSearch
1208 { 1210 {
1209 // 根据品牌Id获取品牌banner图 1211 // 根据品牌Id获取品牌banner图
1210 $bannerImg = Helpers::getImageUrl($brandBanner, '', 150); 1212 $bannerImg = Helpers::getImageUrl($brandBanner, '', 150);
1211 - $brandHome = Helpers::url('/product/index/brand', '', $brand['brand_domain']);  
1212 - $brandIntro = Helpers::url('/product/index/brandIntro', '', $brand['brand_domain']); 1213 + $brandHome = Helpers::url('', '', $brand['brand_domain']);
  1214 + $brandIntro = Helpers::url('/about', '', $brand['brand_domain']);
1213 $is_favorite = false; 1215 $is_favorite = false;
1214 if(isset($brand['is_favorite'])){ 1216 if(isset($brand['is_favorite'])){
1215 // 获取是否收藏 1217 // 获取是否收藏
@@ -41,13 +41,15 @@ class SaleModel @@ -41,13 +41,15 @@ class SaleModel
41 $specialInfo['data']['banner'][] = $v; 41 $specialInfo['data']['banner'][] = $v;
42 } 42 }
43 $special = $specialInfo['data']; 43 $special = $specialInfo['data'];
44 - }  
45 44
46 //Sale首页 banner数据 45 //Sale首页 banner数据
47 $data['saleBanner']['bannerHeight'] = $special['banner'][0]['height']; 46 $data['saleBanner']['bannerHeight'] = $special['banner'][0]['height'];
48 $data['saleBanner']['img'] = $special['banner'][0]['img']; 47 $data['saleBanner']['img'] = $special['banner'][0]['img'];
49 $data['saleTitle']['name'] = '全部商品'; 48 $data['saleTitle']['name'] = '全部商品';
50 $data['saleTitle']['count'] = $data['totalCount']; 49 $data['saleTitle']['count'] = $data['totalCount'];
  50 + }
  51 +
  52 +
51 53
52 //获取广告位数据 54 //获取广告位数据
53 if (isset($special['left_ad_code'])) { 55 if (isset($special['left_ad_code'])) {
@@ -62,7 +62,7 @@ class IndexController extends WebAction @@ -62,7 +62,7 @@ class IndexController extends WebAction
62 } 62 }
63 63
64 //品牌介绍页 64 //品牌介绍页
65 - public function brandAboutAction() 65 + public function aboutAction()
66 { 66 {
67 //品牌域名 67 //品牌域名
68 $domain = $this->param('named'); 68 $domain = $this->param('named');