修改随机模板-随机组件部分

app/JsonRpc/PublicRpcService.php

@@ -3576,7 +3576,7 @@ class PublicRpcService implements PublicRpcServiceInterface
         $component[] = $this->randomComponent($sector_id,$data,$sector);
         var_dump("sector_id",$sector_id);
         return [
-            'sector_id'=>$sector_id,
+            // 'sector_id'=>$sector_id,
             'sector_count'=>count($sector),
             // 'sectors'=>$sectors,
             // 'sector_comnum'=>$sector_comnum,
@@ -3647,7 +3647,20 @@ class PublicRpcService implements PublicRpcServiceInterface
             //     $component_img[$component_id][$sort_id][$img_key] = [];
             // }
             // $component_img = array_values($component_img[$component_id][$sort_id]);
-            $groupedResults[$sector_id][$sort_id] =
+            if(in_array($value['type_id'],[19, 20, 21, 22, 23, 24])){
+               $groupedResults[$sector_id][$sort_id] =
+                [
+                    'component_type' => $component_id,
+                    'sort' => $value['sort_id'],
+                    'type_id' => $value['type_id'],
+                    'componentData' => [
+                        $component_json['componentData'],
+                        $component_json['componentData'],
+                    ],
+                    'images' => $component_img[$component_id][$sort_id]
+                ];
+            }else{
+                $groupedResults[$sector_id][$sort_id] =
                 [
                     'component_type' => $component_id,
                     'sort' => $value['sort_id'],
@@ -3655,6 +3668,8 @@ class PublicRpcService implements PublicRpcServiceInterface
                     'componentData' => $component_json['componentData'],
                     'images' => $component_img[$component_id][$sort_id]
                 ];
+            }
+            
             if(in_array($value['type_id'],[11,14,24])){
                 $groupedResults[$sector_id][$sort_id]['ad'] = json_decode($value['ad'],JSON_UNESCAPED_UNICODE);
             }
@@ -3698,7 +3713,6 @@ class PublicRpcService implements PublicRpcServiceInterface
             if (isset($groupedResults[$sectorid]) && !empty($groupedResults[$sectorid]) && is_array($groupedResults[$sectorid])) {
                 $componet_key = 0;
                 foreach ($groupedResults[$sectorid] as $sortId => $components) {
-                   var_dump('start-------------------------------------sortId',$sortId);
             // //     //     // 通栏某一位置的随机组件
                     // if (count($components) > 1) {
                     //     $componentIds = count($components);
@@ -3722,21 +3736,33 @@ class PublicRpcService implements PublicRpcServiceInterface
                         }
                         if (isset($components['images'][$selectedImage])) {
                             $Component['component_style'] = is_object($components['images'][$selectedImage]) ? $components['images'][$selectedImage]->img_id : $components['images'][$selectedImage]['img_id'];
-                            var_dump('action2-------------------------------------sortId',$sortId);
                         }
                     }
-                    var_dump('action3-------------------------------------sortId',$selectedImage);
                     if(isset($components['images'][$selectedImage])){
                         $image_info[$key] = is_object($components['images'][$selectedImage]) ? $components['images'][$selectedImage] : $components['images'][$selectedImage];
-                    }
-                    var_dump('action4-------------------------------------sortId',$sortId);       
-              // var_dump($images);
-                    $Component['componentData'] = $components['componentData'] ?? [];
+                    }     
+                    // var_dump($images);
+                    // if(isset($components['type_id']) && in_array($components['type_id'], [19, 20, 21, 22, 23, 24])){
+                    //     // $Component['componentData'][0] = $components['componentData'] ?? [];
+                    //     // $Component['componentData'][1] = $components['componentData'] ?? [];
+                    // }else{
+                        $Component['componentData'] = $components['componentData'] ?? [];
+                    // }
                     if ($data['page'] == 1 && (isset($components['type_id']) && in_array($components['type_id'], [7, 14, 15, 23, 24]))) {
-                        $Component['componentData']['name'] = '请选择栏目';
+                        if(in_array($components['type_id'], [23, 24])){
+                            $Component['componentData'][0]['name'] = '请选择栏目';
+                            $Component['componentData'][1]['name'] = '请选择栏目';
+                        }else{
+                            $Component['componentData']['name'] = '请选择栏目';
+                        }
                     }
                     if ($data['page'] == 2 && (isset($components['type_id']) && in_array($components['type_id'], [7, 14, 15, 23, 24]))) {
-                        $Component['componentData']['name'] = '自动生成';
+                        if(in_array($components['type_id'], [23, 24])){
+                            $Component['componentData'][0]['name'] = '自动生成';
+                            $Component['componentData'][1]['name'] = '自动生成';
+                        }else{
+                            $Component['componentData']['name'] = '自动生成';
+                        }
                     }
                     if (isset($components['type_id']) && $components['type_id'] == 11) {
                         $ad = $components['ad'];