更新内容

.env.dev

@@ -57,3 +57,6 @@ VITE_PUSHER_PORT="${PUSHER_PORT}"
 VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
 VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
+#oss
+OSS_HOST=http://mietubl-dev.oss-cn-hongkong.aliyuncs.com
+

app/Http/Controllers/HomeController.php

@@ -13,6 +13,7 @@ use App\Models\SiteAlbumLog;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
+use ZipArchive;
 
 
 class HomeController extends Controller
@@ -30,11 +31,25 @@ class HomeController extends Controller
      */
     public function gallery(Request $request)
     {
-        $folder_id = $request->input('fid',$this->getFoldersTreeFirstId());
-        $father_id = $this->getFoldersTreeFatherId($folder_id);
-        $folder = SiteAlbumFolder::find($folder_id);
-        $albums = SiteAlbum::where('folder_id', $folder_id)->get();
-        $albums = $albums->toArray();
+        $search = $request->input('search', '');
+        if ($search) {
+            $search = '%' . $search . '%';
+            $albums = SiteAlbum::where('title', 'like', $search)->get();
+            $title = '搜索结果';
+            $folder_id = 0;
+            $father_id = 0;
+            if ($albums) {
+                $albums = $albums->toArray();
+            }
+        } else {
+            $folder_id = $request->input('fid',$this->getFoldersTreeFirstId());
+            $father_id = $this->getFoldersTreeFatherId($folder_id);
+            $folder = SiteAlbumFolder::find($folder_id);
+            $albums = SiteAlbum::where('folder_id', $folder_id)->get();
+            $albums = $albums->toArray();
+            $title = $folder->title;
+        }
+
         foreach ($albums as $key => $album) {
             $cover = json_decode($album['cover']);
             foreach ($cover as $k => $v) {
@@ -49,7 +64,7 @@ class HomeController extends Controller
         return view('gallery',
             [
                 'foldersTree' => $this->foldersTree,
-                'folderName'=> $folder->title,
+                'folderName'=> $title,
                 'folder_id' => $folder_id,
                 'father_id' => $father_id,
                 'albums' => $albums
@@ -70,7 +85,7 @@ class HomeController extends Controller
                 switch ($value) {
                     case '0':
                         $column = 'cover';
-                        $title = '主页';
+                        $title = '主图';
                         break;
                     case '1':
                         $column = 'en_detail';
@@ -117,6 +132,57 @@ class HomeController extends Controller
         ]);
     }
 
+    /*
+     * 下载全部
+     */
+
+    public function downloadAll(Request $request)
+    {
+        $id = $request->input('id', 0);
+        $tab = $request->input('tab', 'cover');
+        $album = SiteAlbum::find($id);
+
+        if ($album) {
+            $album = $album->toArray();
+
+            if (isset($album[$tab])) {
+                $files = json_decode($album[$tab]);
+                $fileUrls = [];
+
+                // 获取所有图片的 URL
+                foreach ($files as $key => $value) {
+                    $fileUrl = ossUrl($value); // 获取完整的图片 URL
+                    $fileUrls[] = $fileUrl; // 将图片 URL 存入数组
+                }
+
+                // 创建一个临时 ZIP 文件
+                $zipFileName = 'album_' . $id . '_' . $tab . '.zip';
+                $zipPath = storage_path('app/' . $zipFileName);
+                $zip = new ZipArchive;
+
+                if ($zip->open($zipPath, ZipArchive::CREATE) === TRUE) {
+                    foreach ($fileUrls as $fileUrl) {
+                        $fileContent = file_get_contents($fileUrl); // 下载图片内容
+                        $fileName = basename($fileUrl); // 获取文件名
+                        $zip->addFromString($fileName, $fileContent); // 将图片添加到 ZIP 文件中
+                    }
+
+                    $zip->close();
+
+                    // 提供 ZIP 文件下载
+                    return response()->download($zipPath, $zipFileName)->deleteFileAfterSend(true);
+                } else {
+                    return response()->json(['error' => '无法创建 ZIP 文件'], 500);
+                }
+            } else {
+                return response()->json(['error' => '未找到指定的 Tab 数据'], 404);
+            }
+        } else {
+            return response()->json(['error' => '未找到相册'], 404);
+        }
+    }
+
+
 
     /*
      * 更新日志

app/helpers.php

@@ -0,0 +1,14 @@
+<?php
+
+if (! function_exists('ossUrl')) {
+    /*
+     * 如果url 不是http或https开头，则加上oss的域名
+     * @param string $path 路径
+     */
+    function ossUrl($path) {
+        if (strpos($path, 'http') === 0 || strpos($path, 'https') === 0) {
+            return $path;
+        }
+        return env('OSS_HOST'). $path;
+    }
+}

composer.json

@@ -21,6 +21,9 @@
         "spatie/laravel-ignition": "^2.0"
     },
     "autoload": {
+        "files": [
+            "app/helpers.php"
+        ],
         "psr-4": {
             "App\\": "app/",
             "Database\\Factories\\": "database/factories/",

public/static/css/main.css

@@ -1950,3 +1950,46 @@ video {
 }
 
 
+.search-wrapper {
+    width: 100%;
+    margin-bottom: 30px;
+    text-align: right;
+    height: 47px;
+}
+
+
+.search-box {
+    position: relative;
+    float: right;
+    right: 10px;
+    width: 300px;
+    display: flex;
+    align-items: center;
+    background-color: #f9f9f9;
+    border-radius: 20px;
+    padding: 5px 10px;
+    box-shadow: 0 0 10px rgba(255, 255, 255, 0.1);
+}
+
+/* 搜索输入框 */
+.search-box input {
+    flex: 1;
+    border: none;
+    outline: none;
+    background: transparent;
+    color: #888;
+    font-size: 14px;
+    padding: 8px;
+}
+
+/* 搜索图标 */
+.search-box .fa-search {
+    color: #888;
+    font-size: 18px;
+    cursor: pointer;
+}
+
+/* 鼠标悬停时图标颜色变化 */
+.search-box .fa-search:hover {
+    color: #888;
+}

public/static/js/script.js

@@ -229,9 +229,9 @@ $(document).ready(function() {
 		// 获取当前父级下所有 .album-thumb-detail img 的 src
 		var imageSrcArray = [];
 		$parentAlbum.find('.album-thumb-detail img').each(function () {
-            src = $(this).attr('src')
-            newSrc = src.split('?')[0];
-			imageSrcArray.push(newSrc);
+            src = $(this).attr('data-src')
+           // newSrc = src.split('?')[0];
+			imageSrcArray.push(src);
 		});
 
 		// 获取当前点击图片在数组中的索引
@@ -291,6 +291,7 @@ $(document).ready(function() {
 	$videoBtns.on('click', function() {
 		const videoSrc = $(this).data('src'); // 获取 data-src 属性
 		$videoPlayer.attr('src', videoSrc); // 设置视频源
+        $videoPlayer[0].autoplay = true; // 设置自动播放
 		$overlay.css('display', 'flex'); // 显示遮罩层
 	});
 

resources/views/gallery-detail.blade.php

@@ -82,8 +82,8 @@
                                 @foreach($content as $item)
                                 <tr>
                                     <td>
-                                        <a href="{{$item['cover']}}" target="_blank">
-                                            <img src="{{$item['cover']}}?x-oss-process=image/resize,w_100"   width="100">
+                                        <a href="{{ossUrl($item['cover'])}}" target="_blank">
+                                            <img src="{{ossUrl($item['cover'])}}?x-oss-process=image/resize,w_100"   width="100">
                                         </a>
                                     </td>
                                     <td>
@@ -120,10 +120,10 @@
                         @foreach($content as $item)
                         <div class="grid-item album-item">
                             <div class="album-thumb album-thumb-detail">
-                                <img  data-src="{{$item}}?x-oss-process=image/resize,m_fill,w_380,h_380" src="{{$item}}?x-oss-process=image/resize,m_fill,w_380,h_380" alt="1">
+                                <img  data-src="{{ossUrl($item)}}" src="{{ossUrl($item)}}?x-oss-process=image/resize,m_fill,w_380,h_380" alt="1">
                                 <div class="album-mask">
                                     <!-- 下载图标 -->
-                                    <a href="{{$item}}" download class="download-icon" target="_blank">
+                                    <a href="{{ossUrl($item)}}" download class="download-icon" target="_blank">
                                         <i class="fa fa-cloud-download"></i>
                                     </a>
                                 </div>

resources/views/gallery.blade.php

@@ -48,23 +48,35 @@
                     </div>
                 </div>
 
+                <form action="/gallery" method="get" enctype="multipart/form-data">
+                <div class="search-wrapper">
+                    <div class="search-box">
+                        <input type="text" placeholder="搜索..." name="search" value="{{request('search')}}">
+                        <i class="fa fa-search"></i>
+                    </div>
+                </div>
+                </form>
+
                 <!-- Album Animals START -->
                 <div class="grid-album is-active gallery-album" >
                     <div class="grid-sizer"></div>
-
-                    @foreach($albums as $album)
-                    <div class="grid-item album-item">
-                        <a href="/detail?id={{$album['id']}}">
-                            <div class="album-thumb">
-                                <img src="{{$album['cover'][0]}}?x-oss-process=image/resize,m_fill,w_380,h_380" data-src="{{$album['cover'][0]}}?x-oss-process=image/resize,m_fill,w_380,h_380" class="" alt="Graceful Zebra">
-                            </div>
-                            <div class="album-name">{{$album['title']}}</div>
-                            <div class="album-desc">
-                                型号：{{$album['model']}}
-                            </div>
-                        </a>
-                    </div>
-                    @endforeach
+                    @if (empty($albums) == true)
+                        数据为空
+                    @else
+                        @foreach($albums as $album)
+                        <div class="grid-item album-item">
+                            <a href="/detail?id={{$album['id']}}">
+                                <div class="album-thumb">
+                                    <img src="{{ossUrl($album['cover'][0])}}?x-oss-process=image/resize,m_fill,w_380,h_380" data-src="{{ossUrl($album['cover'][0])}}?x-oss-process=image/resize,m_fill,w_380,h_380" class="" alt="Graceful Zebra">
+                                </div>
+                                <div class="album-name">{{$album['title']}}</div>
+                                <div class="album-desc">
+                                    型号：{{$album['model']}}
+                                </div>
+                            </a>
+                        </div>
+                        @endforeach
+                    @endif
 
                 </div>
                 <!-- Album Animals END -->

routes/web.php

@@ -21,6 +21,7 @@ Route::get('/gallery', [HomeController::class, 'gallery']);
 Route::get('/next-log', [HomeController::class, 'nextLog']);
 Route::get('/update-log', [HomeController::class, 'updateLog']);
 Route::get('/detail', [HomeController::class, 'detail']);
+Route::get('/download-all', [HomeController::class, 'downloadAll']);