修改接口：随机模板-广告数据结构

app/JsonRpc/PublicRpcService.php

@@ -3097,6 +3097,7 @@ class PublicRpcService implements PublicRpcServiceInterface
                 if(!in_array($component_type,[10,12,16])){
                     if($component_type == 11 || $component_type == 14){
                         $groupedResults[(int)$sectorId][(int)$sort_id][$com_key]['ad'] = $component_ad;
+                        $groupedResults[(int)$sectorId][(int)$sort_id][$com_key]['ad']['website_id'] = $data['website_id'];
                     }
                     if($component_type != 11){
                         $groupedResults[(int)$sectorId][(int)$sort_id][$com_key]['componentData'] = $component_code['componentData'];
@@ -3193,7 +3194,7 @@ class PublicRpcService implements PublicRpcServiceInterface
                     $image_info[$key] = is_object($components[$selectedComponentId]['images'][$selectedImage]) ? $components[$selectedComponentId]['images'][$selectedImage] : $components[$selectedComponentId]['images'][$selectedImage];
 
                     // var_dump($images);
-                    $Component['componentData'] = $components[$selectedComponentId]['componentData'];
+                    $Component['componentData'] = $components[$selectedComponentId]['componentData'] ?? [];
                     if($data['page'] == 1 &&(isset($components[$selectedComponentId]['type_id']) && in_array($components[$selectedComponentId]['type_id'],[7,14,15])) ){
                         $Component['componentData']['name'] = '请选择栏目';
                     }
@@ -3201,47 +3202,24 @@ class PublicRpcService implements PublicRpcServiceInterface
                         $Component['componentData']['name'] = '自动生成';
                     }
                     if(isset($components[$selectedComponentId]['type_id']) && $components[$selectedComponentId]['type_id'] == 11){
-                        $ad = $components[$selectedComponentId]['componentData']['ad'];
-                        
+                        $ad = $components[$selectedComponentId]['ad'];
+                        $ad['thumb'] = $image_info[$key]['img_url'];
                         $template_data[$key]['ad'] = $ad;
-                        $values = [
-                            $components[$selectedComponentId]['width'],
-                            $components[$selectedComponentId]['height'],
-                            '',
-                            '',
-                            '',
-                            $data['website_id'],
-                            $image_info[$key]['img_url'],
-                            2,
-                            0
-                        ];
-                        $canvas_adinfo[$key] = array_combine(array_slice($ad, 0, count($values)), $values);
+                        $canvas_adinfo[$key] = $ad;
                         $canvas_data[$key]['content']['ad'] = $canvas_adinfo[$key];
-                       // 确保 $ad 和 $canvas_adinfo[$key] 元素数量一致，直接组合
-                    //    $canvas_data[$key]['ad'] = array_combine($ad, $canvas_adinfo[$key]);
+                    //    // 确保 $ad 和 $canvas_adinfo[$key] 元素数量一致，直接组合
+                    // //    $canvas_data[$key]['ad'] = array_combine($ad, $canvas_adinfo[$key]);
                        $Component['componentData'] = [];
                     }
                     if(isset($components[$selectedComponentId]['type_id']) && $components[$selectedComponentId]['type_id'] == 14){
                         $ad = $components[$selectedComponentId]['ad'];
+                        $ad['thumb'] = $image_info[$key]['img_url'];
                         $template_data[$key]['ad'] = $ad;
+                        $canvas_adinfo[$key] = $ad;
+                        $canvas_data[$key]['content']['ad'] = $canvas_adinfo[$key];
+                    // //    $canvas_data[$key]['ad'] = array_combine($ad, $canvas_adinfo[$key]);
 
-
-                        $values = [
-                            $components[$selectedComponentId]['width'],
-                            $components[$selectedComponentId]['height'],
-                            '',
-                            '',
-                            '',
-                            $data['website_id'],
-                            $image_info[$key]['img_url'],
-                            2,
-                            0
-                        ];
-                        $canvas_adinfo[$key] = array_combine(array_slice($ad, 0, count($values)), $values);
-                    $canvas_data[$key]['content']['ad'] = $canvas_adinfo[$key];
-                    //    $canvas_data[$key]['ad'] = array_combine($ad, $canvas_adinfo[$key]);
-
-                        $Component['componentData'] = [];
+                    //     // $Component['componentData'] = [];
                     }
                     // var_dump('---------------------------',$components[$selectedComponentId]);
                     $sector_component[$sortId] = $Component;