添加组件、修改组件、验证关键词重复

app/JsonRpc/PublicRpcService.php

@@ -1736,6 +1736,12 @@ class PublicRpcService implements PublicRpcServiceInterface
             default:
                 break;
         }
+        if($data['type_id'] == 24){
+            unset($add_arr['ad']);
+            $add_arr['ad'][0] = $ad;
+            $add_arr['ad'][1] = $ad;
+            $add_arr['ad'] = json_encode($add_arr['ad'],true);
+        }
         // if----带广告的特殊处理（广告位默认图上传静态资源的处理---已废弃）
         // if ($data['type_id'] == 11 || $data['type_id'] == 14) {
         //     Db::beginTransaction();
@@ -2054,6 +2060,12 @@ class PublicRpcService implements PublicRpcServiceInterface
             // 'ad_imgid' => null,
             'adimg_info' => '[]',
         ];
+        if($data['type_id'] == 24){
+            unset($add_arr['ad']);
+            $add_arr['ad'][0] = $ad;
+            $add_arr['ad'][1] = $ad;
+            $add_arr['ad'] = json_encode($add_arr['ad'],true);
+        }
         Db::beginTransaction();
         try{
             // return Result::success($add_arr);
@@ -4280,8 +4292,8 @@ class PublicRpcService implements PublicRpcServiceInterface
      */
     public function checkRepeatKeyword(array $data): array
     {
-        if(empty($data['keyword'])){
-            return Result::error('关键词不能为空！');
+        if(empty($data['keyword']) || $data['keyword'] == ''){
+            return Result::success('关键词为空');
         }
         $keyword = json_decode($data['keyword'],true);
         // return Result::success(is_array($keyword));
@@ -4308,7 +4320,6 @@ class PublicRpcService implements PublicRpcServiceInterface
             if(in_array($keyword,$template_keyword)){
                 return Result::error('此皮肤关键词已存在！');
             }
-            return Result::success(['关键词'=>$keyword,'type'=>$template_keyword]);
         }
         if($data['type'] == 'sector'){
             $sector_keyword = Sector::where('template_id',$data['template_id'])->pluck('sector_keyword')->toArray();