|
@@ -219,7 +219,6 @@ class CmsContentTemplateSetRepository
|
|
} else {
|
|
} else {
|
|
$new_rule[$k]['area_type'] = "subject_two";
|
|
$new_rule[$k]['area_type'] = "subject_two";
|
|
}
|
|
}
|
|
- $new_rule[$k]['name'] = $v['name'];
|
|
|
|
$new_rule[$k]['floor_img'] = $v['floor_img'];
|
|
$new_rule[$k]['floor_img'] = $v['floor_img'];
|
|
$new_rule[$k]['id'] = intval($v['id']);
|
|
$new_rule[$k]['id'] = intval($v['id']);
|
|
$new_rule[$k]['rule'] = $decode_subject;
|
|
$new_rule[$k]['rule'] = $decode_subject;
|
|
@@ -228,7 +227,6 @@ class CmsContentTemplateSetRepository
|
|
foreach ($new_rule as $k => $v) {
|
|
foreach ($new_rule as $k => $v) {
|
|
$group_array['content'][$k + 1]['area_type'] = $new_rule[$k]['area_type'];
|
|
$group_array['content'][$k + 1]['area_type'] = $new_rule[$k]['area_type'];
|
|
$group_array['content'][$k + 1]['id'] = $new_rule[$k]['id'];
|
|
$group_array['content'][$k + 1]['id'] = $new_rule[$k]['id'];
|
|
- $group_array['content'][$k + 1]['name'] = $new_rule[$k]['name'];
|
|
|
|
$group_array['content'][$k + 1]['floor_img'] = $new_rule[$k]['floor_img'];
|
|
$group_array['content'][$k + 1]['floor_img'] = $new_rule[$k]['floor_img'];
|
|
$group_array['content'][$k + 1]['rule'] = $new_rule[$k]['rule'];
|
|
$group_array['content'][$k + 1]['rule'] = $new_rule[$k]['rule'];
|
|
}
|
|
}
|
|
@@ -246,7 +244,6 @@ class CmsContentTemplateSetRepository
|
|
$new_rule[$key]['id'] = $val['id'];
|
|
$new_rule[$key]['id'] = $val['id'];
|
|
$new_rule[$key]['show_type'] = intval($show_type->show_type) ?? '';
|
|
$new_rule[$key]['show_type'] = intval($show_type->show_type) ?? '';
|
|
$new_rule[$key]['url'] = $rule['url'];
|
|
$new_rule[$key]['url'] = $rule['url'];
|
|
- $new_rule[$key]['title'] = $rule['title'];
|
|
|
|
$new_rule[$key]['link_url'] = intval($rule['link_url']);
|
|
$new_rule[$key]['link_url'] = intval($rule['link_url']);
|
|
$new_rule[$key]['link_type'] = $rule['link_type'];
|
|
$new_rule[$key]['link_type'] = $rule['link_type'];
|
|
$new_rule[$key]['rule'] = $get_product['products'] ?? [];
|
|
$new_rule[$key]['rule'] = $get_product['products'] ?? [];
|
|
@@ -257,7 +254,6 @@ class CmsContentTemplateSetRepository
|
|
$group_array['content'][$count + $key + 1]['id'] = $val['id'];
|
|
$group_array['content'][$count + $key + 1]['id'] = $val['id'];
|
|
$group_array['content'][$count + $key + 1]['show_type'] = $val['show_type'];
|
|
$group_array['content'][$count + $key + 1]['show_type'] = $val['show_type'];
|
|
$group_array['content'][$count + $key + 1]['floor_img'] = $val['url'];
|
|
$group_array['content'][$count + $key + 1]['floor_img'] = $val['url'];
|
|
- $group_array['content'][$count + $key + 1]['title'] = $val['title'];
|
|
|
|
$group_array['content'][$count + $key + 1]['link_url'] = $val['link_url'];
|
|
$group_array['content'][$count + $key + 1]['link_url'] = $val['link_url'];
|
|
$group_array['content'][$count + $key + 1]['link_type'] = $val['link_type'];
|
|
$group_array['content'][$count + $key + 1]['link_type'] = $val['link_type'];
|
|
$group_array['content'][$count + $key + 1]['rule'] = $val['rule'];
|
|
$group_array['content'][$count + $key + 1]['rule'] = $val['rule'];
|