|
@@ -44,7 +44,8 @@ class CmsContentTemplateSetRepository {
|
|
$banner_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>0])->get();
|
|
$banner_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>0])->get();
|
|
$new_rule = [];
|
|
$new_rule = [];
|
|
foreach ($banner_rule->toArray() as $k=>$v){
|
|
foreach ($banner_rule->toArray() as $k=>$v){
|
|
- $new_rule[] = $v;
|
|
|
|
|
|
+ $new_rule[]['id'] = $v['id'];
|
|
|
|
+ $new_rule[]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
|
|
}
|
|
}
|
|
$group_array['content'][0]['rule'] = $new_rule;
|
|
$group_array['content'][0]['rule'] = $new_rule;
|
|
|
|
|
|
@@ -53,7 +54,8 @@ class CmsContentTemplateSetRepository {
|
|
|
|
|
|
$new_rule = [];
|
|
$new_rule = [];
|
|
foreach ($subject_rule->toArray() as $k=>$v){
|
|
foreach ($subject_rule->toArray() as $k=>$v){
|
|
- $new_rule[] = $v;
|
|
|
|
|
|
+ $new_rule[]['id'] = $v['id'];
|
|
|
|
+ $new_rule[]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
|
|
}
|
|
}
|
|
$group_array['content'][1]['rule'] = $new_rule;
|
|
$group_array['content'][1]['rule'] = $new_rule;
|
|
|
|
|
|
@@ -61,7 +63,8 @@ class CmsContentTemplateSetRepository {
|
|
$floor_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>2])->get();
|
|
$floor_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>2])->get();
|
|
$new_rule = [];
|
|
$new_rule = [];
|
|
foreach ($floor_rule->toArray() as $k=>$v){
|
|
foreach ($floor_rule->toArray() as $k=>$v){
|
|
- $new_rule[] = $v;
|
|
|
|
|
|
+ $new_rule[]['id'] = $v['id'];
|
|
|
|
+ $new_rule[]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
|
|
}
|
|
}
|
|
foreach ($new_rule as $k=>$v){
|
|
foreach ($new_rule as $k=>$v){
|
|
$rules = json_decode($v['rule'],true);
|
|
$rules = json_decode($v['rule'],true);
|
|
@@ -84,7 +87,8 @@ class CmsContentTemplateSetRepository {
|
|
$category_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>3])->get();
|
|
$category_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>3])->get();
|
|
$new_rule = [];
|
|
$new_rule = [];
|
|
foreach ($category_rule->toArray() as $k=>$v){
|
|
foreach ($category_rule->toArray() as $k=>$v){
|
|
- $new_rule[] = $v;
|
|
|
|
|
|
+ $new_rule[]['id'] = $v['id'];
|
|
|
|
+ $new_rule[]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
|
|
}
|
|
}
|
|
$group_array['content'][3]['rule'] = $new_rule;
|
|
$group_array['content'][3]['rule'] = $new_rule;
|
|
}
|
|
}
|