|
@@ -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
|
}
|