改动返回

app/Repositories/CmsContentTemplateSetRepository.php

@@ -162,7 +162,8 @@ class CmsContentTemplateSetRepository {
         $new_rule = [];
 
         foreach ($banner_rule->toArray() as $k=>$v){
-            $new_rule[] = $v;
+            $new_rule[$k]['id'] = $v['id'];
+            $new_rule[$k]['rule'] = json_decode($v['rule'],true);
         }
         $group_array['content'][0]['rule'] = $new_rule;
 
@@ -171,7 +172,8 @@ class CmsContentTemplateSetRepository {
 
         $new_rule = [];
         foreach ($subject_rule->toArray() as $k=>$v){
-            $new_rule[] = $v;
+            $new_rule[$k]['id'] = $v['id'];
+            $new_rule[$k]['rule'] = json_decode($v['rule'],true);
         }
         $group_array['content'][1]['rule'] = $new_rule;
 
@@ -179,10 +181,12 @@ class CmsContentTemplateSetRepository {
         $floor_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$request['tpl_id'],'area_type'=>2])->get();
         $new_rule = [];
         foreach ($floor_rule->toArray() as $k=>$v){
-            $new_rule[] = $v;
+            $new_rule[$k]['id'] = $v['id'];
+            $new_rule[$k]['rule'] = json_decode($v['rule'],true);
         }
         foreach ($new_rule as $k=>$v){
-            $rules = json_decode($v['rule'],true);
+            if ($v){
+                $rules = $v['rule'];
                 $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')->get();
                 $pro_array = $product->toArray();
@@ -194,6 +198,7 @@ class CmsContentTemplateSetRepository {
                 unset($v['show_num']);
                 unset($rules['link_url']);
                 unset($v['link_type']);
+            }
         }
                 $group_array['content'][2]['rule'] = $new_rule;
 
@@ -202,14 +207,13 @@ class CmsContentTemplateSetRepository {
             $category_rule = $this->cmsContentTemplateSet->select('id','rule')->where(['tpl_id'=>$request['tpl_id'],'area_type'=>3])->get();
             $new_rule = [];
             foreach ($category_rule->toArray() as $k=>$v){
-                $new_rule[] = $v;
+                $new_rule[$k]['id'] = $v['id'];
+                $new_rule[$k]['rule'] = json_decode($v['rule'],true);
             }
             $group_array['content'][3]['rule'] = $new_rule;
         }
 
-        $group_json = json_encode($group_array,JSON_UNESCAPED_UNICODE);
-
-        return $group_json;
+        return $group_array;
 
     }