Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -314,17 +314,17 @@ class PrivateController extends BaseController
         $product = Product::where(['status' => Product::STATUS_ON])->where('created_at', '>=', $date)->pluck('route');
         $product = Product::where(['status' => Product::STATUS_ON])->where('created_at', '>=', $date)->pluck('route');
         $news = News::where(['status' => News::STATUS_ONE])->where('release_at', '>', $date)->pluck('url');
         $news = News::where(['status' => News::STATUS_ONE])->where('release_at', '>', $date)->pluck('url');
         $blog = Blog::where(['status' => Blog::STATUS_ONE])->where('release_at', '>', $date)->pluck('url');
         $blog = Blog::where(['status' => Blog::STATUS_ONE])->where('release_at', '>', $date)->pluck('url');
-        $keyword = Keyword::where('created_at', '>', $date)->pluck('route');
+//        $keyword = Keyword::where('created_at', '>', $date)->pluck('route');
 
 
         // 组装链接
         // 组装链接
         foreach ($product as $item) {
         foreach ($product as $item) {
             $url = 'https://' . $domain . '/' . $item;
             $url = 'https://' . $domain . '/' . $item;
             array_push($result, $url);
             array_push($result, $url);
         }
         }
-        foreach ($keyword as $item) {
-            $url = 'https://' . $domain . '/' . $item;
-            array_push($result, $url);
-        }
+//        foreach ($keyword as $item) {
+//            $url = 'https://' . $domain . '/' . $item;
+//            array_push($result, $url);
+//        }
         foreach ($news as $item) {
         foreach ($news as $item) {
             $url = 'https://' . $domain . '/news/' . $item;
             $url = 'https://' . $domain . '/news/' . $item;
             array_push($result, $url);
             array_push($result, $url);

@@ -105,10 +105,8 @@ class DetailController extends BaseController
     public function saveDetail(DetailLogic $logic){
     public function saveDetail(DetailLogic $logic){
         $this->request->validate([
         $this->request->validate([
             'product_id'=>'required',
             'product_id'=>'required',
-            'data'=>'required',
         ],[
         ],[
             'product_id.required' => '产品id不能为空',
             'product_id.required' => '产品id不能为空',
-            'data.required' => 'data不能为空',
         ]);
         ]);
         $data = $logic->saveDetail();
         $data = $logic->saveDetail();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);

@@ -51,27 +51,29 @@ class DetailLogic extends BaseLogic
      * @time   :2024/11/13 9:30
      * @time   :2024/11/13 9:30
      */
      */
     public function saveDetail(){
     public function saveDetail(){
-        try {
-            foreach ($this->param['data'] as $data){
-                foreach ($data as $v){
-                    $save_data = [
-                        'sort'=>$v['sort'],
-                        'column_id'=>$v['column_id'],
-                        'product_id'=>$this->param['product_id'],
-                        'text_type'=>$v['text_type'],
-                        'title'=>$v['title'] ?? '',
-                        'content'=>json_encode($v['content'] ?? []),
-                        'css'=>json_encode($v['css'] ?? []),
-                    ];
-                    if(isset($v['id']) && !empty($v['id'])){
-                        $this->edit($save_data,['id'=>$v['id']]);
-                    }else{
-                        $this->model->add($save_data);
+        if(!empty($data)){
+            try {
+                foreach ($this->param['data'] as $data){
+                    foreach ($data as $v){
+                        $save_data = [
+                            'sort'=>$v['sort'],
+                            'column_id'=>$v['column_id'],
+                            'product_id'=>$this->param['product_id'],
+                            'text_type'=>$v['text_type'],
+                            'title'=>$v['title'] ?? '',
+                            'content'=>json_encode($v['content'] ?? []),
+                            'css'=>json_encode($v['css'] ?? []),
+                        ];
+                        if(isset($v['id']) && !empty($v['id'])){
+                            $this->edit($save_data,['id'=>$v['id']]);
+                        }else{
+                            $this->model->add($save_data);
+                        }
                     }
                     }
                 }
                 }
+            }catch (\Exception $e){
+                $this->fail('保存失败，请联系管理员.错误：'.$e->getMessage());
             }
             }
-        }catch (\Exception $e){
-            $this->fail('保存失败，请联系管理员.错误：'.$e->getMessage());
         }
         }
         return $this->success(['product_id'=>$this->param['product_id']]);
         return $this->success(['product_id'=>$this->param['product_id']]);
     }
     }