Browse Source

更新内容

moshaorui 1 month ago
parent
commit
3b3fa9d555

+ 1 - 0
app/Models/SiteAlbumFolder.php

@@ -22,6 +22,7 @@ class SiteAlbumFolder extends Model
     {
         return $folders
             ->where('parent_id', $parentId) // 过滤出当前层级的文件夹
+            ->sortByDesc('order') // 按顺序排序
             ->map(function ($folder) use ($folders) {
                 // 递归获取子文件夹
                 $folder->children = self::buildTree($folders, $folder->id);

+ 16 - 2
public/static/css/main.css

@@ -126,7 +126,7 @@
 
 /* Global Styles START */
 :root {
-  --color-def: #ED9027;
+  --color-def: #ff9216;
   --color-2: #2B2C30;
   --color-1: #2a2832;
   --color-3: #2a1832;
@@ -535,10 +535,24 @@ a {
   top: 30px;
   left: 50px;
   z-index: 1;
+    text-align: center;
 }
 .sidebar-logo img {
   max-width: 100px;
 }
+.sidebar-logo span {
+    margin-top: 10px;
+    display: block;
+    font-size: 14px;
+
+    color: #ffffff;
+    position: relative;
+    left: -4px;
+}
+
+.sidebar-logo:hover {
+    color: #fff;
+}
 .menu-wrap {
   position: fixed;
   left: 0;
@@ -557,7 +571,7 @@ a {
 
 .menu-nav {
   padding: 50px;
-  padding-top: 120px;
+  padding-top: 140px;
   transition: 0.5s ease;
   opacity: 0;
   transform: translateX(-100%);

File diff suppressed because it is too large
+ 0 - 1
public/static/images/logo.svg


+ 1 - 1
public/static/js/script.js

@@ -316,7 +316,7 @@ $(document).ready(function() {
         // 获取当前父级下所有 .album-thumb-detail img 的 src
         var imageSrcArray = [];
         $parentAlbum.find('.album-thumb-detail img').each(function () {
-            src = $(this).attr('data-src');
+            src = $(this).attr('data-src')+"?x-oss-process=image/resize,w_800";
             // newSrc = src.split('?')[0];
             imageSrcArray.push(src);
         });

+ 2 - 1
resources/views/__sidebar.blade.php

@@ -1,7 +1,8 @@
 <div class="sidebar">
     <div class="menu-wrap @if ($active) menu-active @endif">
         <a href="/main" class="sidebar-logo">
-            <img src="/static/images/logo-new.png" alt="Sylvia" width="100px">
+            <img src="/static/images/logo.svg" alt="Sylvia" width="140px">
+            <span>美特柏产品资料共享图库</span>
         </a>
         <nav class="menu-nav @if ($active) menu-item-active @endif">
             <ul>

+ 1 - 1
resources/views/login.blade.php

@@ -76,7 +76,7 @@
         <img src="/static/images/logo.png" alt="logo">
     </div>
     <div class="login-container">
-        <h2>登录</h2>
+        <h2>美特柏产品资料共享图库</h2>
         <input type="text"  name="username" placeholder="用户名" required>
         <input type="password" name="password" placeholder="密码" required>
         <div style="color:red;" id="errorMsg"></div>

Some files were not shown because too many files changed in this diff