From ede1ec5344aac3a9fa577a010a70038443d3acb7 Mon Sep 17 00:00:00 2001 From: Wisp X <1591788658@qq.com> Date: Tue, 22 Mar 2022 08:13:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=AE=A1=E7=90=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8Cpsd=E3=80=81tiff=20=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88=E6=97=B6=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=BC=A9=E7=95=A5=E5=9B=BE=20#339?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Admin/ImageController.php | 2 +- resources/views/admin/image/index.blade.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/ImageController.php b/app/Http/Controllers/Admin/ImageController.php index b723a28b..c6f39ac5 100644 --- a/app/Http/Controllers/Admin/ImageController.php +++ b/app/Http/Controllers/Admin/ImageController.php @@ -67,7 +67,7 @@ class ImageController extends Controller } })->latest()->paginate(40); $images->getCollection()->each(function (Image $image) { - $image->append('url', 'pathname'); + $image->append('url', 'pathname', 'thumb_url'); $image->album?->setVisible(['name']); $image->group?->setVisible(['name']); $image->strategy?->setVisible(['name']); diff --git a/resources/views/admin/image/index.blade.php b/resources/views/admin/image/index.blade.php index 6d59e8ad..5787f201 100644 --- a/resources/views/admin/image/index.blade.php +++ b/resources/views/admin/image/index.blade.php @@ -353,9 +353,10 @@ $('.item').click(function () { let image = $(this).data('json'); + let previewUrl = ['psd', 'tif'].indexOf(image.extension) === -1 ? image.url : image.thumb_url; let html = $('#image-tpl').html() .replace(/__id__/g, image.id) - .replace(/__url__/g, image.url) + .replace(/__url__/g, previewUrl) .replace(/__user_name__/g, image.user ? image.user.name+'('+image.user.email+')' : '游客') .replace(/__user_email__/g, image.user ? image.user.email : '-') .replace(/__album_name__/g, image.album ? image.album.name : '-')