Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/PublicController.php

@@ -2437,7 +2437,9 @@ class PublicController extends AbstractController
             [
                 'component_id' => 'required|int',
                 'template_id' => 'required|int',
-                'img_url' => 'required|string'
+                'img_url' => 'required|string',
+                'img_id' => 'required|int',
+
 
             ],
             [
@@ -2447,6 +2449,9 @@ class PublicController extends AbstractController
                 'template_id.int' => '皮肤编号必须为整数',
                 'img_url.required' => '图片url不能为空',
                 'img_url.url' => '图片url必须为url格式',
+                'img_id.required' => '图片编号不能为空',
+                'img_id.int' => '图片编号必须为整数',
+
 
             ]
         );
@@ -2471,7 +2476,9 @@ class PublicController extends AbstractController
                 'id' => 'required|int',
                 'component_id' => 'required|int',
                 'template_id' => 'required|int',
-                'img_url' => 'required|string'
+                'img_url' => 'required|string',
+                'img_id' => 'required|int',
+
 
             ],
             [
@@ -2483,6 +2490,9 @@ class PublicController extends AbstractController
                 'template_id.int' => '皮肤编号必须为整数',
                 'img_url.required' => '图片url不能为空',
                 'img_url.url' => '图片url必须为url格式',
+                'img_id.required' => '图片编号不能为空',
+                'img_id.int' => '图片编号必须为整数',
+
 
             ]
         );
@@ -2521,5 +2531,19 @@ class PublicController extends AbstractController
         $result = $this->publicServiceClient->delComponentImg($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 自助建站-获取通栏类型
+     * @return array
+     */
+    public function getSectorType()
+    {
+        $requireData = $this->request->all();
+        $result = $this->publicServiceClient->getSectorType($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    
+
+    
+     
 }
 

app/JsonRpc/PublicRpcService.php

@@ -505,6 +505,14 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * 自助建站-获取通栏类型
+     */
+    public function getSectorType(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
 
 
 

app/JsonRpc/PublicRpcServiceInterface.php

@@ -243,6 +243,9 @@ interface PublicRpcServiceInterface
     public function delComponentImg(array $data);
     //自助建站-组件管理-更新组件预览图
     public function updateComponentImg(array $data);
+    //自助建站-获取通栏类型
+    public function getSectorType(array $data);
+
 
 
 

config/api/public.php

@@ -140,6 +140,10 @@ Router::addGroup(
 
         //获取所有的通栏版式
         Router::post('/getAllSectorPlace', [PublicController::class, 'getAllSectorPlace']);
+
+        // 获取所有通栏分类
+        Router::post('/getSectorType', [PublicController::class, 'getSectorType']);
+
     },
     ['middleware' => [FooMiddleware::class]]
 );