更新内容

app/Http/Controllers/AuthController.php

@@ -23,6 +23,7 @@ class AuthController extends BaseController
     {
         // 登录逻辑
         $credentials = $request->only(['username', 'password']);
+
         $remember = (bool) $request->input('remember', false);
 
         $validator = Validator::make($credentials, [
@@ -34,6 +35,10 @@ class AuthController extends BaseController
             return ['status'=>'fail','message'=>$validator->errors()];
         }
 
+        //去除空格
+        $credentials = array_map('trim', $credentials);
+
+
         if (Auth::guard('web')->attempt($credentials, false)) {
 
 

app/Http/Controllers/HomeController.php

@@ -40,8 +40,9 @@ class HomeController extends Controller
     {
         $search = $request->input('search', '');
         if ($search) {
+            $search = trim($search);
             $search = '%' . $search . '%';
-            $albums = SiteAlbum::where('title', 'like', $search)->orderBy('id', 'desc')->get();
+            $albums = SiteAlbum::where('model', 'like', $search)->orderBy('id', 'desc')->get();
             $title = '搜索结果';
             $folder_id = 0;
             $father_id = 0;
@@ -90,6 +91,7 @@ class HomeController extends Controller
         $showTabs = [];
         if ($bumFolder) {
             $row = json_decode($bumFolder->show_tabs);
+            $row[7] = '7';
             foreach ($row as $key => $value) {
                 $column = '';
                 $title = '';
@@ -122,6 +124,10 @@ class HomeController extends Controller
                         $column = 'pdf';
                         $title = 'PDF';
                         break;
+                    case '7':
+                        $column = 'parameters';
+                        $title = '属性';
+                        break;
                 }
                 $content = json_decode($album[$column], true);
                 if (empty($content) == false) {
@@ -129,7 +135,7 @@ class HomeController extends Controller
                 }
             }
         }
-
+       // dd(json_decode($album['parameters'], true));
         return view('gallery-detail',[
             'foldersTree' => $this->foldersTree,
             'album' => $album->toArray(),

app/Http/Middleware/Auth.php

@@ -9,7 +9,7 @@ class Auth
     public function handle($request, Closure $next)
     {
         if (\Illuminate\Support\Facades\Auth::guard('web')->check() == false) {
-            die('未登录');
+            die("未登录，请先<a href='/'>登录</a>");
         }
         //否则继续处理当前请求
         return $next($request);

public/static/css/main.css

@@ -1,8 +1,9 @@
 /* 更新日志*/
 .breadcrumb-box {
-    float: right;
-    min-width: 300px;
+    float: left;
+    min-width: 100px;
     font-size: 16px;
+    text-align: left;
 }
 
 .log-page {
@@ -24,10 +25,27 @@
     font-family: Arial, sans-serif;
     color: #333;
 }
+.update-log .update-log-link {
+    width: 70%;
+    float: left;
+    display: block;
+}
+.update-log .login-out-link {
+    float: left;
+    color: #555;
+    font-size: 12px;
+    width: 30%;
+    display: block;
+    text-align: right;
+}
+
 .update-log .timestamp {
     color: #555;
     font-size: 12px;
 }
+.update-log .timestamp a {
+    color: #ED9027;
+}
 .update-log .message {
     margin-top: 5px;
     font-size: 12px;
@@ -104,7 +122,7 @@
 
 /* Global Styles START */
 :root {
-  --color-def: #2a2832;
+  --color-def: #ED9027;
   --color-2: #2B2C30;
   --color-1: #2a2832;
   --color-3: #2a1832;
@@ -121,7 +139,7 @@ html, body {
 
 body {
   font-family: 'Roboto';
-  background-color: var(--color-def);
+  background-color: #ffffff;
   color: #fff;
   line-height: 1.5;
   margin: 0;
@@ -172,7 +190,7 @@ h2 {
 
 .title-wrapper {
   margin: 0 auto 30px auto;
-  max-width: 500px;
+  /*max-width: 500px;*/
 }
 
 input, textarea, div {
@@ -204,7 +222,7 @@ a {
 
 .content {
   width: 100%;
-  padding-left: 307px;
+  padding-left: 264px;
 }
 
 .content-inner {
@@ -514,7 +532,7 @@ a {
   z-index: 1;
 }
 .sidebar-logo img {
-  max-width: 47px;
+  max-width: 100px;
 }
 .menu-wrap {
   position: fixed;
@@ -572,14 +590,14 @@ a {
 }
 
 .menu-nav ul li:nth-last-child(n+1) a {
-  margin-bottom: 25px;
+  margin-bottom: 15px;
 }
 
 .menu-nav ul a {
   text-transform: uppercase;
   text-decoration: none;
   font-weight: 300;
-  font-size: 18px;
+  font-size: 16px;
   display: block;
   letter-spacing: 2px;
   position: relative;
@@ -1258,11 +1276,13 @@ a {
 }
 .grid-album .grid-sizer,
 .grid-album .grid-item {
-    width: calc(25% - 15px);
+    /*width: calc(25% - 15px);*/
+    width: 340px;
     margin-bottom: 15px;
 }
 
 
+
 .grid-album .grid-item {
   float: left;
   z-index: 0;
@@ -1470,245 +1490,7 @@ a {
 /* Footer END */
 
 
-/* Responsive START */
-@media screen and (max-width: 1024px) {
-  .container-full {
-    padding: 0 20px;
-  }
-  .grid-single .grid-sizer,
-  .grid-single .grid-item {
-    width: calc(33% - 15px);
-  }
-}
-
-@media screen and (max-width: 992px) {
-
-  /* Sidebar 992 START */
-  .menu-nav {
-    padding-top: 120px;
-  }
-  /* Sidebar 992 END */
-
-  /* Banner 992 START */
-  .swiper-banner .swiper-slide {
-    padding: 30px 30px 30px 0;
-  }
-  .banner-item {
-    padding: 150px 50px 70px 50px;
-    height: auto;
-  }
-  .banner-nav-wrap {
-    bottom: 30px;
-    right: 30px;
-  }
-  /* Banner 992 END */
-
-  /* About 992 START */
-  .about-content {
-    padding: 40px 0 100px 100px;
-  }
-  /* About 992 END */
-
-  /* Contact page 992 START */
-  .contact-row {
-    flex-direction: column;
-  }
-  .s-contact .left {
-    margin-bottom: 30px;
-  }
-  /* Contact page 992 END */
-
-}
-
-@media screen and (max-width: 768px) {
-
-  /* Sidebar 768 START */
-  .sidebar {
-    height: auto;
-    width: 100%;
-    padding: 10px 20px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-  .sidebar .hamburger-button {
-    top: 0;
-    right: 0;
-    transform: none;
-    position: static;
-  }
-  .sidebar .logo {
-    position: static;
-  }
-
-  .content {
-    padding-left: 0;
-    margin-top: 52px;
-  }
-  /* Sidebar 768 END */
-
-  /* Banner 768 START */
-  .swiper-banner .swiper-slide {
-    padding: 0;
-  }
-  .banner-nav-wrap {
-    bottom: 0;
-    right: 0;
-  }
-  .banner-title {
-    font-size: 32px;
-    line-height: 42px;
-  }
-  .banner-item {
-    padding: 100px 40px 150px 40px;
-    height: calc(100vh - 52px);
-    background-position: center center;
-  }
-  /* Banner 768 END */
-
-  /* Album 768 START */
-  .gallery-wrap {
-    margin-left: 0;
-  }
-  .gallery-wrap .content-inner {
-    padding: 0 40px;
-  }
-  .grid-album .grid-sizer,
-  .grid-album .grid-item {
-    width: calc(50% - 10px);
-  }
-  /* Album 768 END */
-
-  /* Contact page 768 START */
-  .contact-content {
-    padding: 100px 40px;
-  }
-  /* Contact page 768 END */
-
-  /* Footer 768 START */
-  .site-footer {
-    padding: 20px;
-  }
-  .footer-copyright {
-    font-size: 14px;
-  }
-  /* Footer 768 END */
-    .update-content {
-        padding: 10px 10px;
-    }
-
-    .album_table .void-img{width: 100px;}
-}
-
-@media screen and (max-width: 575px) {
-
-  /* Global 575 START */
-  .title {
-    font-size: 40px;
-    margin-bottom: 10px;
-  }
-  .subtitle {
-    font-size: 16px;
-  }
-  .preloader-item img {
-    max-width: 80px;
-  }
-  /* Global 575 END */
-
-  .grid-single .grid-sizer,
-  .grid-single .grid-item {
-    width: calc(50% - 10px);
-    margin-bottom: 10px;
-  }
-
-  /* About 575 START */
-  .about-content .left-avatar {
-    height: 340px;
-  }
-  /* About 575 END */
-
-  /* Album 575 START */
-  .gallery-wrap .content-inner {
-    padding: 0 20px;
-  }
-  .grid-album .grid-sizer,
-  .grid-album .grid-item {
-    width: 100%;
-  }
-  /* Album 575 END */
 
-  /* Gallery single 575 START */
-  .grid-single {
-    padding-bottom: 50px;
-  }
-  /* Gallery single 575 END */
-
-  /* Contact page 575 START */
-  .contact-content {
-    padding: 110px 20px 50px 20px;
-  }
-  .s-contact .left {
-    width: 100%;
-    max-width: 400px;
-    padding: 40px 20px;
-  }
-  /* Contact page 575 END */
-    .update-content {
-        padding: 10px 10px;
-    }
-    .breadcrumb-box {
-        padding: 5px 0px;
-        float: left;
-        min-width:auto;
-    }
-    .album_table .void-img{width: 100px;}
-}
-
-@media screen and (max-width: 480px) {
-
-  /* Sidebar 480 START */
-  .sidebar {
-    padding: 8px 20px;
-  }
-  .sidebar-logo {
-    top: 20px;
-    left: 25px;
-  }
-  .sidebar .logo img {
-    width: 40px;
-  }
-  .sidebar .hamburger-button span:nth-last-child(n+2) {
-    margin-bottom: 9px;
-  }
-  .menu-nav {
-    padding: 130px 25px 25px 25px;
-  }
-  .menu-nav ul a {
-    font-size: 18px;
-  }
-  .menu-close__wrap {
-    left: 25px;
-  }
-  .menu-nav .menu-contacts {
-    margin-top: 50px;
-  }
-  .menu-nav .menu-social {
-    margin-top: 50px;
-  }
-  /* Sidebar 480 END */
-
-  /* Banner 480 START */
-  .banner-item {
-    padding: 60px 30px 100px 30px;
-  }
-  .banner-nav-wrap {
-    width: 100%;
-    max-width: 400px;
-  }
-  /* Banner 480 END */
-
-}
-/* Responsive END */
 .menu-nav .menu-nav-son {
   display: block;
 }
@@ -1845,7 +1627,7 @@ a {
 
 /* 全屏图片 */
 .fullscreen-mask img {
-  max-width: 90%;
+  max-width: 80%;
   max-height: 90%;
   transform: scale(0.8);
   transition: transform 0.3s ease;
@@ -1856,10 +1638,10 @@ a {
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
-  color: #fff;
+  color: #ffffff;
   font-size: 56px;
   cursor: pointer;
-  z-index: 1;
+  z-index: 999;
 }
 
 .fullscreen-btn:hover {
@@ -1887,11 +1669,12 @@ a {
 
 .gallery-album-line {
   width: 100%;
-  height: 20px;
   border-bottom: 1px solid #ccc;
   margin-bottom: 30px;
-  font-size: 12px;
+  font-size: 16px;
   text-align: right;
+    line-height: 25px;
+    height: 25px;
 }
 
 .gallery-album-line a{
@@ -1914,26 +1697,27 @@ table.album_table {
   border-collapse: collapse;
   margin: 20px 0px 30px;
 }
+
 table.album_table th, table.album_table td {
   padding: 12px;
   text-align: left;
-  border-bottom: 1px solid #444;
+  border-bottom: 1px solid #ccc;
 
 }
 table.album_table th {
-  background-color: #333;
-  color: #fff;
+  color: #555;
   font-weight: bold;
+
+    font-size: 16px;
 }
 table.album_table td {
-  background-color: #222;
-  color: #ddd;
+  color: #555;
 }
 table.album_table img {
   border-radius: 5px;
 }
 table.album_table button {
-  background-color: #555;
+  background-color: #ccc;
   color: white;
   border: none;
   padding: 8px 12px;
@@ -1999,14 +1783,15 @@ video {
 .search-box {
     position: relative;
     float: left;
-    right: 10px;
     width: 290px;
     display: flex;
     align-items: center;
     background-color: #f9f9f9;
     border-radius: 20px;
-    padding: 5px 10px;
+    padding: 2px 10px;
     box-shadow: 0 0 10px rgba(255, 255, 255, 0.1);
+    left: 10px;
+    top: -8px;
 }
 
 /* 搜索输入框 */
@@ -2047,7 +1832,10 @@ video {
 .main-body .album-thumb {
     border:2px solid #ccc;
     width: 100%;
-    min-height: 345px;
+    min-height: 340px;
+}
+.main-body .album-thumb-gallery {
+    height: 340px;
 }
 .main-body  {
     color: #2a2832;
@@ -2075,7 +1863,7 @@ video {
     right: 20px;
     font-size: 24px;
     cursor: pointer;
-    color: #fff;
+    color: #ffffff;
     background-color: rgba(0, 0, 0, 0.5);
     padding: 10px;
     border-radius: 50%;
@@ -2084,6 +1872,256 @@ video {
 
 
 
+.clear {
+    clear: both;
+}
+
+
+
 
 
 
+/* Responsive START */
+@media screen and (max-width: 1024px) {
+    .container-full {
+        padding: 0 20px;
+    }
+    .grid-single .grid-sizer,
+    .grid-single .grid-item {
+        width: calc(33% - 15px);
+    }
+}
+
+@media screen and (max-width: 992px) {
+
+    /* Sidebar 992 START */
+    .menu-nav {
+        padding-top: 120px;
+    }
+    /* Sidebar 992 END */
+
+    /* Banner 992 START */
+    .swiper-banner .swiper-slide {
+        padding: 30px 30px 30px 0;
+    }
+    .banner-item {
+        padding: 150px 50px 70px 50px;
+        height: auto;
+    }
+    .banner-nav-wrap {
+        bottom: 30px;
+        right: 30px;
+    }
+    /* Banner 992 END */
+
+    /* About 992 START */
+    .about-content {
+        padding: 40px 0 100px 100px;
+    }
+    /* About 992 END */
+
+    /* Contact page 992 START */
+    .contact-row {
+        flex-direction: column;
+    }
+    .s-contact .left {
+        margin-bottom: 30px;
+    }
+    /* Contact page 992 END */
+    .breadcrumb-box {
+        margin-bottom: 3px;
+    }
+    .search-box {
+        left: -2px;
+    }
+}
+
+@media screen and (max-width: 768px) {
+
+    /* Sidebar 768 START */
+    .sidebar {
+        height: auto;
+        width: 100%;
+        padding: 10px 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .sidebar .hamburger-button {
+        top: 0;
+        right: 0;
+        transform: none;
+        position: static;
+    }
+    .sidebar .logo {
+        position: static;
+    }
+
+    .content {
+        padding-left: 0;
+        margin-top: 52px;
+    }
+    /* Sidebar 768 END */
+
+    /* Banner 768 START */
+    .swiper-banner .swiper-slide {
+        padding: 0;
+    }
+    .banner-nav-wrap {
+        bottom: 0;
+        right: 0;
+    }
+    .banner-title {
+        font-size: 32px;
+        line-height: 42px;
+    }
+    .banner-item {
+        padding: 100px 40px 150px 40px;
+        height: calc(100vh - 52px);
+        background-position: center center;
+    }
+    /* Banner 768 END */
+
+    /* Album 768 START */
+    .gallery-wrap {
+        margin-left: 0;
+    }
+    .gallery-wrap .content-inner {
+        padding: 0 40px;
+    }
+    .grid-album .grid-sizer,
+    .grid-album .grid-item {
+        width: calc(50% - 10px);
+    }
+    /* Album 768 END */
+
+    /* Contact page 768 START */
+    .contact-content {
+        padding: 100px 40px;
+    }
+    /* Contact page 768 END */
+
+    /* Footer 768 START */
+    .site-footer {
+        padding: 20px;
+    }
+    .footer-copyright {
+        font-size: 14px;
+    }
+    /* Footer 768 END */
+    .update-content {
+        padding: 10px 10px;
+    }
+
+    .album_table .void-img{width: 100px;}
+}
+
+@media screen and (max-width: 575px) {
+
+    /* Global 575 START */
+    .title {
+        font-size: 40px;
+        margin-bottom: 10px;
+    }
+    .subtitle {
+        font-size: 16px;
+    }
+    .preloader-item img {
+        max-width: 80px;
+    }
+    /* Global 575 END */
+
+    .grid-single .grid-sizer,
+    .grid-single .grid-item {
+        width: calc(50% - 10px);
+        margin-bottom: 10px;
+    }
+
+    /* About 575 START */
+    .about-content .left-avatar {
+        height: 340px;
+    }
+    /* About 575 END */
+
+    /* Album 575 START */
+    .gallery-wrap .content-inner {
+        padding: 0 20px;
+    }
+    .grid-album .grid-sizer,
+    .grid-album .grid-item {
+        width: 100%;
+    }
+    /* Album 575 END */
+
+    /* Gallery single 575 START */
+    .grid-single {
+        padding-bottom: 50px;
+    }
+    /* Gallery single 575 END */
+
+    /* Contact page 575 START */
+    .contact-content {
+        padding: 110px 20px 50px 20px;
+    }
+    .s-contact .left {
+        width: 100%;
+        max-width: 400px;
+        padding: 40px 20px;
+    }
+    /* Contact page 575 END */
+    .update-content {
+        padding: 10px 10px;
+    }
+    .breadcrumb-box {
+        padding: 5px 0px;
+        float: left;
+        min-width:auto;
+    }
+    .album_table .void-img{width: 100px;}
+}
+
+@media screen and (max-width: 480px) {
+
+    /* Sidebar 480 START */
+    .sidebar {
+        padding: 8px 20px;
+    }
+    .sidebar-logo {
+        top: 20px;
+        left: 25px;
+    }
+    .sidebar .logo img {
+        width: 40px;
+    }
+    .sidebar .hamburger-button span:nth-last-child(n+2) {
+        margin-bottom: 9px;
+    }
+    .menu-nav {
+        padding: 130px 25px 25px 25px;
+    }
+    .menu-nav ul a {
+        font-size: 18px;
+    }
+    .menu-close__wrap {
+        left: 25px;
+    }
+    .menu-nav .menu-contacts {
+        margin-top: 50px;
+    }
+    .menu-nav .menu-social {
+        margin-top: 50px;
+    }
+    /* Sidebar 480 END */
+
+    /* Banner 480 START */
+    .banner-item {
+        padding: 60px 30px 100px 30px;
+    }
+    .banner-nav-wrap {
+        width: 100%;
+        max-width: 400px;
+    }
+    /* Banner 480 END */
+
+}
+/* Responsive END */

public/static/js/script.js

@@ -80,7 +80,7 @@ $(document).ready(function() {
             if ( window.innerWidth <= 768) {
                 $(".content").css("padding-left","257px");
             } else {
-                $(".content").css("padding-left","307px");
+                $(".content").css("padding-left","264px");
             }
 
 	});
@@ -117,7 +117,7 @@ $(document).ready(function() {
         hamburgerMenuWrap.removeClass('menu-active');
         hamburgerMenuItem.removeClass('menu-item-active');
         menuOverlay.removeClass('menu-overlay__active');
-        $(".content").css("padding-left","80px");
+        $(".content").css("padding-left","0px");
     });
 	// Menu END
 
@@ -177,7 +177,7 @@ $(document).ready(function() {
 		});
 		$gridAlbum.imagesLoaded().progress( function() {
 			$gridAlbum.masonry({
-				gutter: 20
+				gutter: 44
 			});
 		});
 	}
@@ -342,14 +342,8 @@ $(document).ready(function() {
 
         // 点击下载按钮下载当前图片
         $btnDownload.on('click', function (e) {
-
             e.stopPropagation(); // 阻止事件冒泡
-            const currentImageSrc = imageSrcArray[currentImageIndex];
 
-            // 下载图片 js urlencode
-            url = '/download-image?url='+encodeURIComponent(currentImageSrc);
-            window.location.href = url;
-            console.log(url);
             loadIndex = layer.load(2, { shade: [0.8, '#000'] });
             $.ajax({
                 url: '/download-status',
@@ -357,6 +351,11 @@ $(document).ready(function() {
                 dataType: 'json',
                 data: { reset: 1 },
                 success: function(response) {
+                    const currentImageSrc = imageSrcArray[currentImageIndex];
+                    // 下载图片 js urlencode
+                    href_url = '/download-image?url='+encodeURIComponent(currentImageSrc);
+                    window.location.href = href_url;
+
                     checkDownloadStatus();
                 }
             });
@@ -419,7 +418,7 @@ $(document).ready(function() {
                     } else {
                         action = '更新了';
                     }
-                    var model = response.data.model + ' 的';
+                    var model = "<a href='/detail?id="+response.data.content_id+"'>" + response.data.model + '</a> 的';
                     var content = response.data.content;
                     var user_name = response.data.user_name;
 
@@ -427,7 +426,7 @@ $(document).ready(function() {
                     $('.update-log .update-time').text(created_at);
                     $('.update-log .user_name').text(user_name);
                     $('.update-log .action').text(action);
-                    $('.update-log .model').text(model);
+                    $('.update-log .model').html(model);
                     $('.update-log .log-content').text(content);
                 },
                 error: function(xhr, status, error) {
@@ -480,7 +479,7 @@ $(document).ready(function() {
     if ( window.innerWidth <= 768) {
         hamburgerMenuWrap = $('.menu-wrap');
         hamburgerMenuWrap.removeClass('menu-active');
-        $(".content").css("padding-left","80px");
+        $(".content").css("padding-left","0px");
     }
 
 
@@ -494,6 +493,10 @@ function changeIframeSrc(url) {
     if ( window.innerWidth <= 768) {
         hamburgerMenuWrap = $('.menu-wrap');
         hamburgerMenuWrap.removeClass('menu-active');
-        $(".content").css("padding-left","80px");
+        $(".content").css("padding-left","0px");
     }
 }
+
+function logout() {
+    window.top.location.href = "/logout";
+}

resources/views/__sidebar.blade.php

@@ -1,7 +1,7 @@
 <div class="sidebar">
     <div class="menu-wrap @if ($active) menu-active @endif">
-        <a href="#" class="sidebar-logo">
-            <img src="/static/images/logo.png" alt="Sylvia" width="60px">
+        <a href="/main" class="sidebar-logo">
+            <img src="/static/images/logo-new.png" alt="Sylvia" width="100px">
         </a>
         <nav class="menu-nav @if ($active) menu-item-active @endif">
             <ul>
@@ -10,7 +10,7 @@
                 <li class="menu-nav-item">
                     <a @if (empty($tree['children']) == false) href="javascript:void(0)" @else href="#" onclick="changeIframeSrc('/gallery?fid={{ $tree['id'] }}')" @endif>{{ $tree['title'] }}</a>
                     @if (isset($tree['children']))
-                    <ul class="menu-nav-son" @if($tree['checked'] == true)style="display: block;"@endif>
+                    <ul class="menu-nav-son"  @if ($loop->first) style="display: block;" @else style="display: none;"@endif>
                         @foreach ($tree['children'] as $child)
                         <li class="menu-nav-son-li">
                             <a @if (empty($child['children']) == false) href="javascript:void(0)" @else href="#" onclick="changeIframeSrc('/gallery?fid={{ $child['id'] }}')" @endif>{{ $child['title'] }}</a>
@@ -33,12 +33,12 @@
 
             <div class="menu-contacts">
 
-                <a href="#" class="menu-contacts__item">
-					<span class="menu-contacts__icon">
-						<i class="fa fa-envelope"></i>
-					</span>
-                    <p>Marketing@mietubl.com</p>
-                </a>
+{{--                <a href="#" class="menu-contacts__item">--}}
+{{--					<span class="menu-contacts__icon">--}}
+{{--						<i class="fa fa-envelope"></i>--}}
+{{--					</span>--}}
+{{--                    <p>Marketing@mietubl.com</p>--}}
+{{--                </a>--}}
             </div>
             <div class="menu-close__wrap">
                 <a href="javascript:void(0)" class="menu-close"><img style="transform: rotate(180deg);" src="/static/images/arrow-right.svg" alt=""></a>
@@ -46,7 +46,7 @@
         </nav>
     </div>
 
-    <a href="/" class="logo">
+    <a href="/main" class="logo">
         <img src="/static/images/logo.png" alt="">
     </a>
 

resources/views/gallery-detail.blade.php

@@ -33,10 +33,13 @@
 
         <div class="update-content">
             <div class="update-log" >
-                <a href="/update-log">
+                <a href="/update-log" class="update-log-link">
                     <div class="timestamp"><i class="fa fa-volume-up"></i> <span class="update-time">&nbsp;</span> <span class="user_name">&nbsp;</span> <span class="action">&nbsp;</span> <span class="model">&nbsp;</span>  <span class="highlight log-content">&nbsp;</span></div>
-                    <div class="message"></div>
                 </a>
+                <a href="javascript:void(0)" onclick="logout()" class="login-out-link">
+                    退出登录
+                </a>
+                <div class="clear"></div>
             </div>
         </div>
 
@@ -44,7 +47,7 @@
         <div class="content-page gallery-content gallery-wrap">
             <div class="content-inner">
                 <div class="title-wrapper" style="margin-left: 0">
-                    <h2 class="title">{{$album['title']}}</h2>
+                    <h2 class="title">{{$album['model']}}</h2>
                     <div class="subtitle">
                         <p></p>
                     </div>
@@ -108,6 +111,7 @@
                                     <thead>
                                     <tr>
                                         <th>PDF标题</th>
+                                        <th>PDF标题(英文)</th>
                                         <th width="15%">操作</th>
                                     </tr>
                                     </thead>
@@ -115,6 +119,7 @@
                                     @foreach($content as $item)
                                         <tr>
                                             <td>{{$item['pdf_title']}}</td>
+                                            <td>{{@$item['pdf_title_en']}}</td>
                                             <td>
                                                 <a href="{{$item['pdf_src']}}" download class="download-btn" target="_blank"><button>下载</button></a>
                                             </td>
@@ -124,6 +129,25 @@
                                 </table>
                             <br/>
                         @endif
+                    @elseif ($tab['column'] == 'parameters' && empty($content) == false)
+                        <table class="album_table">
+                            <thead>
+                            <tr>
+                                <th>属性名</th>
+                                <th>属性值</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            @foreach($content as $item)
+                                <tr>
+                                    <td>{{$item['key']}}</td>
+                                    <td>
+                                        {{$item['value']}}
+                                    </td>
+                                </tr>
+                            @endforeach
+                            </tbody>
+                        </table>
                     @else
                         <div class="grid-sizer"></div>
                         @foreach($content as $item)

resources/views/gallery.blade.php

@@ -31,9 +31,13 @@
 
         <div class="update-content">
             <div class="update-log" >
-                <a href="/update-log">
+                <a href="/update-log" class="update-log-link">
                     <div class="timestamp"><i class="fa fa-volume-up"></i> <span class="update-time">&nbsp;</span> <span class="user_name">&nbsp;</span>   <span class="action">&nbsp;</span> <span class="model">&nbsp;</span>  <span class="highlight log-content">&nbsp;</span></div>
                 </a>
+                <a href="javascript:void(0)" onclick="logout()" class="login-out-link">
+                    退出登录
+                </a>
+                <div class="clear"></div>
             </div>
         </div>
 
@@ -49,14 +53,16 @@
 
                 <form action="/gallery" method="get" enctype="multipart/form-data" id="search-form">
                 <div class="search-wrapper">
+                    <div class="breadcrumb-box">
+                        {{$breadcrumb}}
+                    </div>
+
                     <div class="search-box">
                         <input type="text" placeholder="搜索..." name="search" value="{{request('search')}}">
                         <i class="fa fa-search"></i>
                     </div>
 
-                    <div class="breadcrumb-box">
-                        {{$breadcrumb}}
-                    </div>
+
                 </div>
                 </form>
 
@@ -69,10 +75,9 @@
                         @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="" loading="lazy" alt="Graceful Zebra">
+                                <div class="album-thumb album-thumb-gallery">
+                                    <img src="{{ossUrl($album['cover'][0])}}?x-oss-process=image/resize,m_fill,w_345,h_345" data-src="{{ossUrl($album['cover'][0])}}?x-oss-process=image/resize,m_fill,w_345,h_345" class="" loading="lazy" alt="Graceful Zebra">
                                 </div>
-                                <div class="album-name" title="{{$album['title']}}">{{$album['title']}}</div>
                                 <div class="album-desc" title="型号：{{$album['model']}}">
                                     型号：{{$album['model']}}
                                 </div>

resources/views/update_log.blade.php

@@ -39,8 +39,7 @@
                         </div>
                         @foreach($log as $item)
                         <div class="log-line active">
-                            <div class="timestamp"><i class="fa fa-volume-up"></i> {{$item['created_at']}} {{$item['user_name']}}@if($item['action'] == 'add')新增@else更新@endif了 {{$item['model']}} 的 <span class="highlight">{{$item['content']}}</span></div>
-                            <div class="message"></div>
+                            <div class="timestamp"><i class="fa fa-volume-up"></i> {{$item['created_at']}} {{$item['user_name']}}@if($item['action'] == 'add')新增@else更新@endif了 <a href="/detail?id={{$item['content_id']}}"> {{$item['model']}}</a> 的 <span class="highlight">{{$item['content']}}</span></div>
                         </div>
                         @endforeach
                     </li>

routes/web.php

@@ -16,7 +16,7 @@ use Illuminate\Support\Facades\Route;
 
 Route::get('/', [AuthController::class, 'getLogin']);
 Route::post('/post-login', [AuthController::class, 'postLogin']);
-
+Route::get('/logout', [AuthController::class, 'logout']);
 
 Route::middleware(['auth'])->group(function () {
     Route::get('/index', [HomeController::class, 'index']);