|
@@ -318,7 +318,6 @@ class special_formater
|
|
|
|
|
|
private function filter_item($special,&$goods_ids,&$scale)
|
|
|
{
|
|
|
-
|
|
|
$block = [];
|
|
|
$block['item_title'] = empty($special['title']) ? '' : $special['title'];
|
|
|
$block['item_type'] = $special['item_type'];
|
|
@@ -326,6 +325,7 @@ class special_formater
|
|
|
$block['bg_image'] = $special['bg_image'];
|
|
|
$block['bg_type'] = $special['bg_type'];
|
|
|
$block['bg_data'] = $special['bg_data'];
|
|
|
+ $block['has_margin'] = $special['has_margin'];
|
|
|
$block_scale = false;
|
|
|
$this->format_property($block,$block_scale);
|
|
|
|
|
@@ -354,6 +354,8 @@ class special_formater
|
|
|
}
|
|
|
elseif($key == 'home3') {
|
|
|
$items = $this->filter_home3($org_items,$goods_ids,$scale);
|
|
|
+ $scale = $block_scale;
|
|
|
+ //todo 此行是进行这次版本与以前版本不同的地方
|
|
|
}
|
|
|
elseif($key == 'home4') {
|
|
|
$items = $this->filter_home4($org_items,$goods_ids,$scale);
|
|
@@ -370,11 +372,13 @@ class special_formater
|
|
|
elseif($key == 'home6') {
|
|
|
$block['item_type'] = 'horizon';
|
|
|
$items = $this->filter_horizon($org_items,$goods_ids,$scale);
|
|
|
+ $scale = $block_scale;
|
|
|
}
|
|
|
elseif ($key == 'home7')
|
|
|
{
|
|
|
$block['item_type'] = 'horizon_goods';
|
|
|
$items = $this->filter_horizon_goods($org_items,$goods_ids,$scale);
|
|
|
+ $scale = $block_scale;
|
|
|
}
|
|
|
|
|
|
else {
|