| xqd
@@ -55,7 +55,6 @@ class UserFolderController extends Controller
|
|
|
public function folderList(Request $request){
|
|
|
|
|
|
$type = $request->get('type',1);
|
|
|
-
|
|
|
$list = UserFolder::query()->withCount('images')->where('type',$type)->where('user_id','=',$this->userId)->get();
|
|
|
return $this->success($list);
|
|
|
}
|
| xqd
@@ -151,11 +150,12 @@ class UserFolderController extends Controller
|
|
|
|
|
|
$id = $request->get('folder_id');
|
|
|
$limit = $request->get('limit',10);
|
|
|
- if(!$id){
|
|
|
- return $this->error("缺少参数ID!");
|
|
|
+ $go = $request->get('go');
|
|
|
+ if(!$id || !$go){
|
|
|
+ return $this->error("缺少参数!");
|
|
|
}
|
|
|
$list = UserFolderImage::query()->where('folder_id','=',$id)->where('user_id',$this->userId)->paginate($limit);
|
|
|
- return $this->success($this->page($list));
|
|
|
+ return $this->success(pages($list,$go));
|
|
|
}
|
|
|
|
|
|
}
|