diff --git a/app/Http/Controllers/Api/AdController copy.php b/app/Http/Controllers/Api/AdController copy.php new file mode 100644 index 0000000..ca6542f --- /dev/null +++ b/app/Http/Controllers/Api/AdController copy.php @@ -0,0 +1,22 @@ +all(), AdFilter::class)->sort(); + $list = $query->show()->sort()->paginate($this->resolvePerPage('per_page', 20)); + + return $this->json(AdResource::collection($list)); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Api/ProjectChildrenController.php b/app/Http/Controllers/Api/ProjectChildrenController.php index 388fec8..21f7136 100644 --- a/app/Http/Controllers/Api/ProjectChildrenController.php +++ b/app/Http/Controllers/Api/ProjectChildrenController.php @@ -13,8 +13,8 @@ class ProjectChildrenController extends Controller { use PaginatorTrait; - public function show(ProjectArticle $children){ + public function show(ProjectArticle $child){ request()->merge(['include_content' => true]); - return $this->json(ProjectChildrenResource::make($children)); + return $this->json(ProjectChildrenResource::make($child)); } } \ No newline at end of file diff --git a/app/Http/Resources/ProjectResource.php b/app/Http/Resources/ProjectResource.php index 2aa136e..1ee4e05 100644 --- a/app/Http/Resources/ProjectResource.php +++ b/app/Http/Resources/ProjectResource.php @@ -18,7 +18,7 @@ class ProjectResource extends JsonResource 'title' => $this->title, 'cover' => $this->cover, 'children' => ProjectChildrenResource::collection($this->whenLoaded('children')), - 'flows' => ProjectFlowResource::collection($this->whenLoaded('flows')), + 'flows' => ProjectFlowResource::make($this->whenLoaded('flows')), 'photos' => ProjectPhotoResource::collection($this->whenLoaded('photos')), 'advances' => ProjectAdvanceResource::collection($this->whenLoaded('advances')), ]; diff --git a/app/Models/ProjectCate.php b/app/Models/ProjectCate.php index e9d5bb1..3a6ce9c 100644 --- a/app/Models/ProjectCate.php +++ b/app/Models/ProjectCate.php @@ -51,7 +51,7 @@ class ProjectCate extends Model //服务流程 public function flows() { - return $this->hasMany(ProjectArticle::class, 'cate')->where('type', ProjectArticle::TYPE_FLOW)->show()->sort(); + return $this->hasOne(ProjectArticle::class, 'cate')->where('type', ProjectArticle::TYPE_FLOW)->show()->sort(); } //相关图片 public function photos() diff --git a/app/Services/Admin/ProjectArticleService.php b/app/Services/Admin/ProjectArticleService.php index 4dd51d7..f60c948 100644 --- a/app/Services/Admin/ProjectArticleService.php +++ b/app/Services/Admin/ProjectArticleService.php @@ -43,7 +43,7 @@ class ProjectArticleService extends BaseService $columns = $this->getTableColumns(); $model = $this->getModel(); - $isEnable = Arr::get($data, 'is_enabled'); + $isEnable = Arr::get($data, 'is_enable'); $publishedAt = Arr::get($data, 'published_at'); if ($isEnable && empty($publishedAt)) { $data['published_at'] = now();