zhangchangchun 5 anni fa
parent
commit
9d0c066414

+ 5 - 1
app/Http/Controllers/V1/CategoryController.php

@@ -24,7 +24,11 @@ class CategoryController extends Controller {
     //列表
     public function index(Request $request) {
         $categoryList = $this->categoryRepository->lists($request->all());
-        return jsonSuccess($categoryList);
+        $fractal = new Manager();
+        $resource = new Collection($categoryList, new CategoryTransformer());
+        $resource->setPaginator(new IlluminatePaginatorAdapter($categoryList));
+        $data = $fractal->createData($resource)->toArray();
+        return jsonSuccess($data);
     }
     //获取多个话题
     public function getTopics(Request $request){

+ 1 - 0
app/Models/PostCollect.php

@@ -6,6 +6,7 @@
  * Time: 13:35
  */
 namespace App\Models;
+
 use Illuminate\Database\Eloquent\Model;
 
 class PostCollect extends Model

+ 2 - 1
app/Repositories/CategoryRepository.php

@@ -20,11 +20,12 @@ class CategoryRepository {
     //列表
     public function lists($request)
     {
+        $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
         $where = [];
         if(isset($request['is_suggest'])){
             $where[] = ['is_suggest', '=', $request['is_suggest']];
         }
-        return $this->category->where($where)->get();
+        return $this->category->where($where)->paginate($perPage);
     }
     //获取多个话题
     public function getTopics($ids){

+ 2 - 2
routes/api.php

@@ -50,13 +50,13 @@ $api->version('v1', [
         $api->get('topic/detail', 'PostController@topicDetail');
         //关注推荐话题
         $api->post('memberFollowTopic', 'MemberFollowTopic@memberFollowTopic');
-        //关注话题
+        //关注单个话题
         $api->post('memberFollowTopic/follow', 'MemberFollowTopic@followTopic');
         //取消关注
         $api->delete('memberFollowTopic/cancel', 'MemberFollowTopic@cancelFollowTopic');
         //关注话题列表
         $api->get('memberFollowTopic', 'MemberFollowTopic@index');
-        //列表
+        //收藏列表
         $api->get('postCollect', 'PostCollectController@index');
     });