From 3b523ceb2c2ff3d6d06d1616cc3734d0b37c8f05 Mon Sep 17 00:00:00 2001
From: icret <thetopuser@gmail.com>
Date: Wed, 4 May 2022 08:53:49 +0000
Subject: [PATCH] =?UTF-8?q?-=20=E6=9B=B4=E6=94=B9=E5=B9=BF=E5=9C=BA?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=BF=94=E5=9B=9E=E9=A1=B6=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                  |   7 ++-
 admin/admin.inc.php        |   6 ++-
 application/footer.php     |   2 +-
 application/list.php       | 106 +++++++++++++------------------------
 public/images/login_bg.jpg | Bin
 5 files changed, 48 insertions(+), 73 deletions(-)
 mode change 100644 => 100755 public/images/login_bg.jpg

diff --git a/README.md b/README.md
index f1e740e..d4c28c6 100755
--- a/README.md
+++ b/README.md
@@ -179,8 +179,11 @@ $HTTP["url"] =~ "^/(i|public)/" {
 * 2022-05-04 v2.6.2 deving
 - 增加API/用户文件浏览和删除
 - 增加转换webp后也会添加水印 
-- webp水印会增大图片体积消耗更多PHP内存,PHP8以上有很大概率失败!
-- 修复一些bugs
+  - 转换成webp后不建议开启水印,会增大图片体积
+  - webp水印消耗更多PHP内存,PHP8以上有很大概率失败
+- 更改广场页面返回顶部
+- 优化了管理界面UI
+- 修复一些bug
 
 * 2022-05-03 v2.6.1
 - 增加登陆用户有效期
diff --git a/admin/admin.inc.php b/admin/admin.inc.php
index ce40458..fcffab1 100755
--- a/admin/admin.inc.php
+++ b/admin/admin.inc.php
@@ -454,8 +454,9 @@ if (isset($_GET['recycle_reimg'])) {
                 <button type="submit" class="btn btn-mini btn-primary">保存</button>
             </form>
             <h5 class="page-header">Token列表: <?php if (!$config['token_path_status']) echo '<small>* 部分按钮需开启Token分离才能激活, 删除后不可恢复</small>'; ?></h5>
-            <p><kbd>API调用网址:<?php echo $config['domain']; ?>/api/index.php</kbd></p>
-            <table class="table table-hover table-bordered table-condensed table-responsive visible-xs visible-sm" style="margin-top: 10px;">
+            <p class="text-primary">API调用地址: <code><?php echo $config['domain']; ?>/api/index.php</code></p>
+            <div class="table-responsive">
+            <table class="table table-condensed table-hover table-bordered visible-xs visible-sm" style="margin-top: 10px;">
                 <thead>
                     <tr>
                         <th>ID</th>
@@ -486,6 +487,7 @@ if (isset($_GET['recycle_reimg'])) {
                     <?php endforeach; ?>
                 </tbody>
             </table>
+            </div>
             <div id="myDataGrid" class="datagrid table-bordered visible-md visible-lg">
                 <div class="input-control search-box search-box-circle has-icon-left has-icon-right" id="searchboxExample2" style="margin-bottom: 10px;">
                     <input id="inputSearchExample2" type="search" class="form-control search-input input-sm" placeholder="搜索Token">
diff --git a/application/footer.php b/application/footer.php
index df38383..1ce9585 100755
--- a/application/footer.php
+++ b/application/footer.php
@@ -36,7 +36,7 @@ if ($config['notice_status'] == 1 && !empty($config['notice'])) : ?>
     </div>
   </div>
 </div>
-<footer class="container text-muted small navbar-fixed-bottom" style="text-align: center;background-color:rgba(255,255,255,0.7);">
+<footer class="container text-muted small navbar-fixed-bottom" style="text-align: center;background-color:rgba(255,255,255,0.7);z-index: 0;">
   <hr>
   <?php /** 页脚信息 */ if (!empty($config['footer'])) echo $config['footer']; ?>
   <p>
diff --git a/application/list.php b/application/list.php
index 081e75a..ef5ae4e 100755
--- a/application/list.php
+++ b/application/list.php
@@ -130,18 +130,33 @@ if ($config['ad_top']) echo $config['ad_top_info'];
         </div>
       </form>
     </div>
+    <!-- 返回顶部-->
+    <div class="btn btn-primary btn-back-to-top"><i class="icon icon-arrow-up"></i></div>
   </div>
 </div>
-<!-- 返回顶部 -->
-<div style="display: none;" id="rocket-to-top">
-  <div style="opacity:0;display: block;" class="level-2"></div>
-  <div class="level-3"></div>
-</div>
-</div>
 <link rel="stylesheet" href="<?php static_cdn(); ?>/public/static/EasyImage.css">
 <link rel="stylesheet" href="<?php static_cdn(); ?>/public/static/viewjs/viewer.min.css">
 <link rel="stylesheet" href="<?php static_cdn(); ?>/public/static/zui/lib/datetimepicker/datetimepicker.min.css">
 <link rel="stylesheet" href="<?php static_cdn(); ?>/public/static/zui/lib/bootbox/bootbox.min.css">
+<style>
+  /* 返回顶部 */
+  .btn-back-to-top {
+    padding: 0.5rem 1rem;
+    position: fixed;
+    right: 2rem;
+    bottom: 1rem;
+    z-index: 2;
+    -webkit-transition: -webkit-transform 0.2s ease;
+    transition: transform 0.2s ease;
+    -webkit-transform: translateY(200%);
+    transform: translateY(200%);
+  }
+
+  .btn-back-to-top.scrolled {
+    -webkit-transform: translateY(0);
+    transform: translateY(0);
+  }
+</style>
 <script src="<?php static_cdn(); ?>/public/static/zui/lib/bootbox/bootbox.min.js"></script>
 <script src="<?php static_cdn(); ?>/public/static/lazyload/lazyload.js"></script>
 <script src="<?php static_cdn(); ?>/public/static/viewjs/viewer.min.js"></script>
@@ -299,69 +314,24 @@ if ($config['ad_top']) echo $config['ad_top_info'];
   }
 
   // 返回顶部
-  $(function() {
-    var e = $("#rocket-to-top"),
-      t = $(document).scrollTop(),
-      n,
-      r,
-      i = !0;
-    $(window).scroll(function() {
-        var t = $(document).scrollTop();
-        t == 0 ? e.css("background-position") == "0px 0px" ? e.fadeOut("slow") : i && (i = !1, $(".level-2").css("opacity", 1), e.delay(100).animate({
-            marginTop: "-1000px"
-          },
-          "normal",
-          function() {
-            e.css({
-                "margin-top": "-125px",
-                display: "none"
-              }),
-              i = !0
-          })) : e.fadeIn("slow")
-      }),
-      e.hover(function() {
-          $(".level-2").stop(!0).animate({
-            opacity: 1
-          })
-        },
-        function() {
-          $(".level-2").stop(!0).animate({
-            opacity: 0
-          })
-        }),
-      $(".level-3").click(function() {
-        function t() {
-          var t = e.css("background-position");
-          if (e.css("display") == "none" || i == 0) {
-            clearInterval(n),
-              e.css("background-position", "0px 0px");
-            return
-          }
-          switch (t) {
-            case "0px 0px":
-              e.css("background-position", "-298px 0px");
-              break;
-            case "-298px 0px":
-              e.css("background-position", "-447px 0px");
-              break;
-            case "-447px 0px":
-              e.css("background-position", "-596px 0px");
-              break;
-            case "-596px 0px":
-              e.css("background-position", "-745px 0px");
-              break;
-            case "-745px 0px":
-              e.css("background-position", "-298px 0px");
-          }
-        }
-        if (!i) return;
-        n = setInterval(t, 50),
-          $("html,body").animate({
-              scrollTop: 0
-            },
-            "slow");
-      });
+  var back_to_top_button = jQuery('.btn-back-to-top');
+  jQuery(window).scroll(function() {
+    if (jQuery(this).scrollTop() > 100 && !back_to_top_button.hasClass('scrolled')) {
+      back_to_top_button.addClass('scrolled');
+
+    } else if (jQuery(this).scrollTop() < 100 && back_to_top_button.hasClass('scrolled')) {
+      back_to_top_button.removeClass('scrolled');
+
+    }
   });
+  // 返回顶部
+  back_to_top_button.click(function() {
+    jQuery('html, body').animate({
+      scrollTop: 0
+    }, 800);
+    return false;
+  });
+
   //懒加载
   var lazy = new Lazy({
     onload: function(elem) {
diff --git a/public/images/login_bg.jpg b/public/images/login_bg.jpg
old mode 100644
new mode 100755