Showing
4 changed files
with
9 additions
and
3 deletions
@@ -33,7 +33,7 @@ class HelperSearch | @@ -33,7 +33,7 @@ class HelperSearch | ||
33 | $options = self::$options; | 33 | $options = self::$options; |
34 | $cookieChannel = isset($_COOKIE['_Channel']) ? $_COOKIE['_Channel'] : 'boys'; | 34 | $cookieChannel = isset($_COOKIE['_Channel']) ? $_COOKIE['_Channel'] : 'boys'; |
35 | if (isset($options['brandName']) && !empty($options['brandName'])) { | 35 | if (isset($options['brandName']) && !empty($options['brandName'])) { |
36 | - $initNav = $options['brandName']; | 36 | + $initNav = $options['brandNameEn'] . $options['brandNameCn']; |
37 | }else{ | 37 | }else{ |
38 | $initNav = '列表'; | 38 | $initNav = '列表'; |
39 | } | 39 | } |
@@ -28,6 +28,8 @@ class IndexController extends WebAction | @@ -28,6 +28,8 @@ class IndexController extends WebAction | ||
28 | $brandId = $brandInfo['data']['id']; | 28 | $brandId = $brandInfo['data']['id']; |
29 | $node = isset($brandInfo['data']['static_content_code']) ? $brandInfo['data']['static_content_code'] : false; | 29 | $node = isset($brandInfo['data']['static_content_code']) ? $brandInfo['data']['static_content_code'] : false; |
30 | $brandBanner = $brandInfo['data']['brand_banner']; | 30 | $brandBanner = $brandInfo['data']['brand_banner']; |
31 | + $brandNameEn = $brandInfo['data']['brand_name_en']; | ||
32 | + $brandNameCn = $brandInfo['data']['brand_name_cn']; | ||
31 | } else { | 33 | } else { |
32 | $this->go(SITE_MAIN); | 34 | $this->go(SITE_MAIN); |
33 | } | 35 | } |
@@ -47,6 +49,8 @@ class IndexController extends WebAction | @@ -47,6 +49,8 @@ class IndexController extends WebAction | ||
47 | $options['brandId'] = $brandId; | 49 | $options['brandId'] = $brandId; |
48 | $options['node'] = $node; | 50 | $options['node'] = $node; |
49 | $options['brandBanner'] = $brandBanner; | 51 | $options['brandBanner'] = $brandBanner; |
52 | + $options['brandNameEn'] = $brandNameEn; | ||
53 | + $options['brandNameCn'] = $brandNameCn; | ||
50 | $options['reviewNum'] = 6; | 54 | $options['reviewNum'] = 6; |
51 | 55 | ||
52 | //调用模型获得数据 | 56 | //调用模型获得数据 |
@@ -29,7 +29,8 @@ class ListController extends WebAction | @@ -29,7 +29,8 @@ class ListController extends WebAction | ||
29 | /** | 29 | /** |
30 | * list列表new(模板new-sale) | 30 | * list列表new(模板new-sale) |
31 | */ | 31 | */ |
32 | - public function newAction(){ | 32 | + public function newAction() |
33 | + { | ||
33 | $condition = array( | 34 | $condition = array( |
34 | 'order' => 's_t_desc' | 35 | 'order' => 's_t_desc' |
35 | ); | 36 | ); |
@@ -113,7 +114,7 @@ class ListController extends WebAction | @@ -113,7 +114,7 @@ class ListController extends WebAction | ||
113 | * @author | 114 | * @author |
114 | * @return json | 115 | * @return json |
115 | */ | 116 | */ |
116 | - public static function changeFavoriteAction() | 117 | + public function changeFavoriteAction() |
117 | { | 118 | { |
118 | if (!$this->isAjax()) { | 119 | if (!$this->isAjax()) { |
119 | return; | 120 | return; |
@@ -46,6 +46,7 @@ class SaleController extends WebAction | @@ -46,6 +46,7 @@ class SaleController extends WebAction | ||
46 | ); | 46 | ); |
47 | 47 | ||
48 | $saleData = Product\SaleModel::getSaleSearchData($condition, $options, $specialInfo); | 48 | $saleData = Product\SaleModel::getSaleSearchData($condition, $options, $specialInfo); |
49 | + | ||
49 | $data = array( | 50 | $data = array( |
50 | //初始化js | 51 | //初始化js |
51 | 'productListPage' => true, | 52 | 'productListPage' => true, |
-
Please register or login to post a comment