...
|
...
|
@@ -14,7 +14,6 @@ class SaleController extends WebAction |
|
|
{
|
|
|
//获取专区ID
|
|
|
$specialsaleId = $this->param('specialsaleId');
|
|
|
$specialsaleId = 1; //测试数据
|
|
|
$specialInfo = SaleData::getSpecial($specialsaleId);
|
|
|
$special = $specialInfo['data'];
|
|
|
|
...
|
...
|
@@ -61,7 +60,7 @@ class SaleController extends WebAction |
|
|
|
|
|
//传促销id
|
|
|
if(!empty($special['ispromotion'])){
|
|
|
//$condition['promotion'] = $special['ispromotion'];
|
|
|
$condition['promotion'] = $special['ispromotion'];
|
|
|
}else{
|
|
|
$condition['promotion'] = $promotion;
|
|
|
}
|
...
|
...
|
|