0.62

app/Http/Controllers/Api/AdController copy.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Traits\PaginatorTrait;
+use App\Models\Ad;
+use App\Models\Filters\AdFilter;
+use App\Http\Resources\AdResource;
+
+class AdController extends Controller
+{
+    use PaginatorTrait;
+
+    public function index(Request $request){
+        $query = Ad::filter($request->all(), AdFilter::class)->sort();
+        $list = $query->show()->sort()->paginate($this->resolvePerPage('per_page', 20));
+
+        return $this->json(AdResource::collection($list));
+    }
+}

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));
     }
 }

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')),
         ];

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()

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();