fe / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit 2555849391c34cda023055caa9d27955a1a62a64 1 parent e98a12f6

基础模板 多品牌无banner

Inline Side-by-side
Showing 1 changed file with 13 additions and 1 deletions
@@ -44,6 +44,7 @@ class IndexController extends WebAction @@ -44,6 +44,7 @@ class IndexController extends WebAction
44 if (!empty($shopIntro['shopTemplateType']) && $shopIntro['shopTemplateType'] === 1) { 44 if (!empty($shopIntro['shopTemplateType']) && $shopIntro['shopTemplateType'] === 1) {
45 //基础模板多个品牌 45 //基础模板多个品牌
46 $result['shopTemplateType'] = $shopIntro['shopTemplateType']; 46 $result['shopTemplateType'] = $shopIntro['shopTemplateType'];
  47 + $result['multBrandShopType'] = $shopIntro['multBrandShopType'];
47 $result['shopId'] = $shopIntro['shopId']; 48 $result['shopId'] = $shopIntro['shopId'];
48 break; 49 break;
49 } 50 }
@@ -74,7 +75,13 @@ class IndexController extends WebAction @@ -74,7 +75,13 @@ class IndexController extends WebAction
74 75
75 //传品牌ID参数 76 //传品牌ID参数
76 $condition = array(); 77 $condition = array();
77 - $condition['brand'] = isset($result['brandId']) ? $result['brandId'] : ''; 78 + if (!empty($result['multBrandShopType']) && !empty($result['shopId']) && $result['multBrandShopType'] === 2) {
  79 + //多品牌按shop搜索
  80 + $condition['shop'] = $result['shopId'];
  81 + } else {
  82 + $condition['brand'] = isset($result['brandId']) ? $result['brandId'] : '';
  83 + }
  84 +
78 $order = $this->get('order'); 85 $order = $this->get('order');
79 if (empty($order)) { 86 if (empty($order)) {
80 $condition['order'] = 'brand_desc'; 87 $condition['order'] = 'brand_desc';
@@ -113,6 +120,11 @@ class IndexController extends WebAction @@ -113,6 +120,11 @@ class IndexController extends WebAction
113 }else{ 120 }else{
114 $arr = array('skn'=>array()); 121 $arr = array('skn'=>array());
115 } 122 }
  123 +
  124 + if (!empty($result['multBrandShopType']) && !empty($result['shopId']) && $result['multBrandShopType'] === 2) {
  125 + //多品牌无banner
  126 + $data['brandBanner'] = array();
  127 + }
116 128
117 $seo = $data['seo']; 129 $seo = $data['seo'];
118 $data = array( 130 $data = array(