|
@@ -282,10 +282,11 @@ class CmsContentTemplateSetRepository
|
|
|
}
|
|
|
|
|
|
$group_array['content'][3]['area_type'] = "floor";
|
|
|
- $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 2,'status'=>1])->get();
|
|
|
+ $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule','floor_img')->where(['tpl_id' => $temalates->id, 'area_type' => 2,'status'=>1])->get();
|
|
|
$new_rule2 = [];
|
|
|
foreach ($floor_rule->toArray() as $k => $v) {
|
|
|
$new_rule2[$k]['id'] = $v['id'];
|
|
|
+ $new_rule2[$k]['floor_img'] = $v['floor_img'];
|
|
|
$decode_floor = \GuzzleHttp\json_decode($v['rule'], true);
|
|
|
$new_rule2[$k]['rule'] = $decode_floor;
|
|
|
}
|
|
@@ -299,7 +300,6 @@ class CmsContentTemplateSetRepository
|
|
|
$res_id = implode(",", array_column($pro_array, 'product_id'));
|
|
|
$get_product = $this->get_product($res_id);
|
|
|
$new_rule2[$k]['products'] = $get_product['products'] ?? [];
|
|
|
-// $new_rule2[$k]['subject_id'] = intval($rules['link_url']);
|
|
|
$new_rule2[$k]['show_type'] = intval($show_type->show_type) ?? '';
|
|
|
unset($v['url']);
|
|
|
unset($rules['link_url']);
|