diff --git a/app/Http/Controllers/User/ImageController.php b/app/Http/Controllers/User/ImageController.php index 16fb6de9..c2ac4698 100644 --- a/app/Http/Controllers/User/ImageController.php +++ b/app/Http/Controllers/User/ImageController.php @@ -41,7 +41,7 @@ class ImageController extends Controller $builder->whereRaw("concat(IFNULL(origin_name,''),IFNULL(alias_name,'')) like ?", ["%{$keyword}%"]); })->when((int) $request->query('album_id'), function (Builder $builder, $albumId) { $builder->where('album_id', $albumId); - })->paginate(1); + })->paginate(40); $images->getCollection()->each(function (Image $image) { $image->human_date = $image->created_at->diffForHumans(); $image->date = $image->created_at->format('Y-m-d H:i:s'); diff --git a/resources/views/images.blade.php b/resources/views/images.blade.php index bbbf05ce..057114dd 100644 --- a/resources/views/images.blade.php +++ b/resources/views/images.blade.php @@ -213,6 +213,7 @@ const resetImages = (params) => { $photos.addClass('reset').html('').justifiedGallery('destroy'); + params = $.extend({page: 1}, params) imagesInfinite.refresh(params); } @@ -391,7 +392,7 @@ }); }, }, - refresh: {text: '刷新', action: _ => imagesInfinite.refresh()}, + refresh: {text: '刷新', action: _ => resetImages()}, open: { text: '新窗口打开', action: e => {