合并分支 'lyh-server' 到 'master'

列表页聚合页模式



查看合并请求 !2470

@@ -61,11 +61,11 @@ class ComController extends BaseController
         $data = [];
         $data = [];
         $is_ai_blog = $this->getIsAiBlog();
         $is_ai_blog = $this->getIsAiBlog();
         if($is_ai_blog != 1){
         if($is_ai_blog != 1){
-            $data[] = 57;
+            $data[] = 6;
         }
         }
         $is_ai_video = $this->getIsAiVideo();
         $is_ai_video = $this->getIsAiVideo();
         if($is_ai_video != 1){
         if($is_ai_video != 1){
-            $data[] = 74;
+            $data[] = 27;
         }
         }
         if($this->user['login_source'] == User::LOGIN_PASSWORD_SOURCE){
         if($this->user['login_source'] == User::LOGIN_PASSWORD_SOURCE){
             $data[] = 19;
             $data[] = 19;

@@ -287,7 +287,6 @@ class InquiryController extends BaseController
             throw new \Exception('文件生成失败，请重试');
             throw new \Exception('文件生成失败，请重试');
         }
         }
         $fileurl = Storage::disk('runtime')->url($file);
         $fileurl = Storage::disk('runtime')->url($file);
-//        return Storage::disk('runtime')->download($file); //直接下载
         $this->response('success',Code::SUCCESS,['url' => $fileurl]);
         $this->response('success',Code::SUCCESS,['url' => $fileurl]);
     }
     }
 
 

@@ -151,6 +151,7 @@ class CategoryLogic extends  BaseLogic
         }else{
         }else{
             $param['describe_image'] = json_encode([]);
             $param['describe_image'] = json_encode([]);
         }
         }
+        $this->param['image'] = $this->param['image'] ?? '';
         if(isset($param['cate_tak']) && !empty($param['cate_tak'])){
         if(isset($param['cate_tak']) && !empty($param['cate_tak'])){
             $param['cate_tak'] = json_encode($param['cate_tak']);
             $param['cate_tak'] = json_encode($param['cate_tak']);
         }else{
         }else{