xielin 6 роки тому
батько
коміт
29a497fb00

+ 8 - 8
app/Http/Repositories/CmsContentTemplateSetRepository.php

@@ -44,8 +44,8 @@ class CmsContentTemplateSetRepository {
         $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[]['id'] = $v['id'];
-            $new_rule[]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
+            $new_rule[$k]['id'] = $v['id'];
+            $new_rule[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
         }
         $group_array['content'][0]['rule'] = $new_rule;
 
@@ -54,8 +54,8 @@ class CmsContentTemplateSetRepository {
 
         $new_rule = [];
         foreach ($subject_rule->toArray() as $k=>$v){
-            $new_rule[]['id'] = $v['id'];
-            $new_rule[]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
+            $new_rule[$k]['id'] = $v['id'];
+            $new_rule[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
         }
         $group_array['content'][1]['rule'] = $new_rule;
 
@@ -63,8 +63,8 @@ class CmsContentTemplateSetRepository {
         $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[]['id'] = $v['id'];
-            $new_rule[]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
+            $new_rule[$k]['id'] = $v['id'];
+            $new_rule[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
         }
         foreach ($new_rule as $k=>$v){
             if($v){
@@ -90,8 +90,8 @@ class CmsContentTemplateSetRepository {
             $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[]['id'] = $v['id'];
-                $new_rule[]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
+                $new_rule[$k]['id'] = $v['id'];
+                $new_rule[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'],true);
             }
             $group_array['content'][3]['rule'] = $new_rule;
         }