|
@@ -126,6 +126,7 @@ class CmsContentTemplateSetRepository
|
|
|
'status' => 0,
|
|
|
'sort' => isset($request['sort']) ? $request['sort'] : 999,
|
|
|
'name' => isset($request['name']) ? $request['name'] : '',
|
|
|
+ 'floor_img' => isset($request['floor_img']) ? $request['floor_img'] : '',
|
|
|
];
|
|
|
if ($id) {
|
|
|
$old_subject_id = $this->cmsContentTemplateSet->select('rule')->find($id);
|
|
@@ -273,6 +274,7 @@ class CmsContentTemplateSetRepository
|
|
|
'status' => 0,
|
|
|
'sort' => isset($request['sort']) ? $request['sort'] : 999,
|
|
|
'name' => isset($request['name']) ? $request['name'] : '',
|
|
|
+ 'floor_img' => isset($request['floor_img']) ? $request['floor_img'] : '',
|
|
|
];
|
|
|
if (empty($floor_id)) {
|
|
|
if ($request['rule']['link_type'] == 1) {
|
|
@@ -623,10 +625,11 @@ class CmsContentTemplateSetRepository
|
|
|
}
|
|
|
|
|
|
$group_array['content'][3]['area_type'] = 2;
|
|
|
- $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $request['tpl_id'], 'area_type' => 2])->get();
|
|
|
+ $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule','floor_img')->where(['tpl_id' => $request['tpl_id'], 'area_type' => 2])->get();
|
|
|
$new_rule = [];
|
|
|
foreach ($floor_rule->toArray() as $k => $v) {
|
|
|
$new_rule[$k]['id'] = $v['id'];
|
|
|
+ $new_rule[$k]['floor_img'] = $v['floor_img'];
|
|
|
$new_rule[$k]['rule'] = json_decode($v['rule'], true);
|
|
|
}
|
|
|
foreach ($new_rule as $k => $v) {
|