Authored by yangyang

修改小bug

@@ -95,9 +95,8 @@ class BrandsModel { @@ -95,9 +95,8 @@ class BrandsModel {
95 $bannerImg = Helpers::getImageUrl($bannerImg['data']['banner'], '', 150); 95 $bannerImg = Helpers::getImageUrl($bannerImg['data']['banner'], '', 150);
96 } 96 }
97 // 根据品牌Id获取品牌(简介)、收藏 97 // 根据品牌Id获取品牌(简介)、收藏
98 - if (isset($uid)) {  
99 - $intro = BrandData::getBrandIntro($brandId, $uid);  
100 - } 98 + $intro = BrandData::getBrandIntro($brandId, $uid);
  99 +
101 $is_favorite = false; 100 $is_favorite = false;
102 $shopName = false; 101 $shopName = false;
103 if(isset($intro['data'])){ 102 if(isset($intro['data'])){
1 <?php 1 <?php
2 use Action\WebAction; 2 use Action\WebAction;
3 -use Product\BrandsModel;  
4 use LibModels\Web\Product\BrandData; 3 use LibModels\Web\Product\BrandData;
5 class IndexController extends WebAction 4 class IndexController extends WebAction
6 { 5 {
@@ -14,7 +14,6 @@ class SaleController extends WebAction @@ -14,7 +14,6 @@ class SaleController extends WebAction
14 { 14 {
15 //获取专区ID 15 //获取专区ID
16 $specialsaleId = $this->param('specialsaleId'); 16 $specialsaleId = $this->param('specialsaleId');
17 - $specialsaleId = 1; //测试数据  
18 $specialInfo = SaleData::getSpecial($specialsaleId); 17 $specialInfo = SaleData::getSpecial($specialsaleId);
19 $special = $specialInfo['data']; 18 $special = $specialInfo['data'];
20 19
@@ -61,7 +60,7 @@ class SaleController extends WebAction @@ -61,7 +60,7 @@ class SaleController extends WebAction
61 60
62 //传促销id 61 //传促销id
63 if(!empty($special['ispromotion'])){ 62 if(!empty($special['ispromotion'])){
64 - //$condition['promotion'] = $special['ispromotion']; 63 + $condition['promotion'] = $special['ispromotion'];
65 }else{ 64 }else{
66 $condition['promotion'] = $promotion; 65 $condition['promotion'] = $promotion;
67 } 66 }