From 71ab7a5da806b1ed06d47736ec7e3b9ecf8a02cf Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Wed, 11 Jan 2023 19:40:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E7=AE=A1=E7=90=86=E5=99=A8=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Admin/Services/FileManagerService.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/beike/Admin/Services/FileManagerService.php b/beike/Admin/Services/FileManagerService.php index 458ce742..78540ebf 100644 --- a/beike/Admin/Services/FileManagerService.php +++ b/beike/Admin/Services/FileManagerService.php @@ -77,8 +77,14 @@ class FileManagerService $page = $page > 0 ? $page : 1; $imageCollection = collect($images); + $currentImages = $imageCollection->forPage($page, $perPage); + $currentImages = $currentImages->map(function ($item) { + $item['url'] = image_resize("{$item['path']}"); + return $item; + }); + return [ - 'images' => $imageCollection->forPage($page, $perPage)->values()->toArray(), + 'images' => $currentImages->values(), 'image_total' => $imageCollection->count(), 'image_page' => $page, ]; @@ -203,11 +209,11 @@ class FileManagerService */ private function handleImage($filePath, $baseName): array { + $path = "catalog{$filePath}"; return [ - 'path' => 'catalog' . $filePath, + 'path' => $path, 'name' => $baseName, - 'url' => image_resize("catalog{$filePath}"), - 'origin_url' => image_origin("catalog{$filePath}"), + 'origin_url' => image_origin($path), 'selected' => false, ]; }