|
@@ -34,7 +34,12 @@ class CmsContentTemplateSetRepository {
|
|
|
}
|
|
|
|
|
|
$group_array['content'][0]['area_type'] ="banner";
|
|
|
- $banner_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$request['tpl_id'],'area_type'=>0])->get();
|
|
|
+ $temalates = $this->cmsContentTemplate->select('id')->where(['city_id'=>$request['city_id'],'apply_type'=>$request['type'],'is_open'=>0])->first();
|
|
|
+ if (!$temalates){
|
|
|
+ throw new HttpException(500, '没有找到对应的模板');
|
|
|
+ }
|
|
|
+
|
|
|
+ $banner_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>0])->get();
|
|
|
$new_rule = [];
|
|
|
foreach ($banner_rule->toArray() as $k=>$v){
|
|
|
$new_rule[] = $v;
|
|
@@ -42,7 +47,7 @@ class CmsContentTemplateSetRepository {
|
|
|
$group_array['content'][0]['rule'] = $new_rule;
|
|
|
|
|
|
$group_array['content'][1]['area_type'] ="special";
|
|
|
- $subject_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$request['tpl_id'],'area_type'=>1])->get();
|
|
|
+ $subject_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>1])->get();
|
|
|
|
|
|
$new_rule = [];
|
|
|
foreach ($subject_rule->toArray() as $k=>$v){
|
|
@@ -51,7 +56,7 @@ class CmsContentTemplateSetRepository {
|
|
|
$group_array['content'][1]['rule'] = $new_rule;
|
|
|
|
|
|
$group_array['content'][2]['area_type'] ="floor";
|
|
|
- $floor_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$request['tpl_id'],'area_type'=>2])->get();
|
|
|
+ $floor_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>2])->get();
|
|
|
$new_rule = [];
|
|
|
foreach ($floor_rule->toArray() as $k=>$v){
|
|
|
$new_rule[] = $v;
|
|
@@ -74,7 +79,7 @@ class CmsContentTemplateSetRepository {
|
|
|
|
|
|
if ($request['type'] == 1){
|
|
|
$group_array['content'][3]['area_type'] ="category";
|
|
|
- $category_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$request['tpl_id'],'area_type'=>3])->get();
|
|
|
+ $category_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$temalates->id,'area_type'=>3])->get();
|
|
|
$new_rule = [];
|
|
|
foreach ($category_rule->toArray() as $k=>$v){
|
|
|
$new_rule[] = $v;
|
|
@@ -82,8 +87,9 @@ class CmsContentTemplateSetRepository {
|
|
|
$group_array['content'][3]['rule'] = $new_rule;
|
|
|
}
|
|
|
|
|
|
- $group_json = json_encode($group_array,JSON_UNESCAPED_UNICODE);
|
|
|
+// $group_json = json_encode($group_array,JSON_UNESCAPED_UNICODE);
|
|
|
+
|
|
|
+ return $group_array;
|
|
|
|
|
|
- return $group_json;
|
|
|
}
|
|
|
}
|