|
@@ -69,12 +69,10 @@ class CmsContentTemplateSetRepository
|
|
$new_rule[$key]['id'] = $key;
|
|
$new_rule[$key]['id'] = $key;
|
|
$new_rule[$key]['rule'] = $value;
|
|
$new_rule[$key]['rule'] = $value;
|
|
$new_rule[$key]['rule']['b_id'] = strval($v['id']);
|
|
$new_rule[$key]['rule']['b_id'] = strval($v['id']);
|
|
|
|
+ $new_rule[$key]['rule']['link_url'] = strval($v['link_url']);//强转link_url类型
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- foreach ($new_rule as $v){
|
|
|
|
- strval($v['rule']['link_url']);//强转link_url类型
|
|
|
|
- }
|
|
|
|
$group_array['content'][0]['rule'] = $new_rule;
|
|
$group_array['content'][0]['rule'] = $new_rule;
|
|
|
|
|
|
$subject_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 1,'status'=>1])->get();
|
|
$subject_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 1,'status'=>1])->get();
|
|
@@ -83,9 +81,9 @@ class CmsContentTemplateSetRepository
|
|
foreach ($subject_rule->toArray() as $k => $v) {
|
|
foreach ($subject_rule->toArray() as $k => $v) {
|
|
$new_rule1[$k]['id'] = $v['id'];
|
|
$new_rule1[$k]['id'] = $v['id'];
|
|
$new_rule1[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
|
|
$new_rule1[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
|
|
- }
|
|
|
|
- foreach ($new_rule1 as $v){
|
|
|
|
- strval($v['rule']['link_url']);
|
|
|
|
|
|
+ foreach ($new_rule1[$k]['rule'] as $value){
|
|
|
|
+ $new_rule1[$k]['rule']['link_url'] = strval($value['link_url']);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
$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')->where(['tpl_id' => $temalates->id, 'area_type' => 2,'status'=>1])->get();
|
|
@@ -98,6 +96,7 @@ class CmsContentTemplateSetRepository
|
|
foreach ($new_rule2 as $k => $v) {
|
|
foreach ($new_rule2 as $k => $v) {
|
|
if ($v) {
|
|
if ($v) {
|
|
$rules = $v['rule'];
|
|
$rules = $v['rule'];
|
|
|
|
+ $rules['link_url'] = strval($rules['link_url']);
|
|
$show_num = intval($rules['show_num']);
|
|
$show_num = intval($rules['show_num']);
|
|
$show_type = $this->cmsSubject->select('show_type')->where('id', $rules['link_url'])->first();
|
|
$show_type = $this->cmsSubject->select('show_type')->where('id', $rules['link_url'])->first();
|
|
$product = $this->cmsSubjectProduct->where('subject_id', $rules['link_url'])->orderBy('sort', 'asc')->limit($show_num)->get();
|
|
$product = $this->cmsSubjectProduct->where('subject_id', $rules['link_url'])->orderBy('sort', 'asc')->limit($show_num)->get();
|
|
@@ -120,10 +119,11 @@ class CmsContentTemplateSetRepository
|
|
foreach ($category_rule->toArray() as $k => $v) {
|
|
foreach ($category_rule->toArray() as $k => $v) {
|
|
$new_rule3[$k]['id'] = $v['id'];
|
|
$new_rule3[$k]['id'] = $v['id'];
|
|
$new_rule3[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
|
|
$new_rule3[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
|
|
|
|
+ foreach ($new_rule3[$k]['rule'] as $value){
|
|
|
|
+ $new_rule3[$k]['rule']['link_url'] = strval($value['link_url']);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- foreach ($new_rule3 as $v){
|
|
|
|
- strval($v['rule']['link_url']);
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
$group_array['content'][1]['rule'] = $new_rule3;
|
|
$group_array['content'][1]['rule'] = $new_rule3;
|
|
$group_array['content'][2]['area_type'] = "special";
|
|
$group_array['content'][2]['area_type'] = "special";
|
|
$group_array['content'][2]['rule'] = $new_rule1;
|
|
$group_array['content'][2]['rule'] = $new_rule1;
|