v2.0.21-20230521

2025-08-10 08:51:49 +00:00 · 2023-05-21 07:24:42 +08:00
parent 840162fd37
commit b5b2707c3c
25 changed files with 96 additions and 53 deletions
--- a/index.php
+++ b/index.php
@@ -34,6 +34,8 @@ if($db_config['type'] == 'sqlite'){
 $global_config = unserialize( get_db("global_config", "v", ["k" => "o_config"]) ); //全局配置
 $c = Get('c');
 $libs = $global_config['Libs'];
+$layui['js']  = $libs.'/Layui/v2.8.3/layui.js';
+$layui['css'] = $libs.'/Layui/v2.8.3/css/layui.css';
 define('libs',$global_config['Libs']);
 define('SysVer',Get_Version());
 define('Debug',$global_config['Debug'] == 1);
--- a/static/Layui/v2.8.3/css/layui-icon.css
+++ b/static/Layui/v2.8.3/css/layui-icon.css
--- a/system/admin.php
+++ b/system/admin.php
@@ -1,14 +1,10 @@
 <?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}AccessControl();

-//获取请求参数
-$page = trim($_GET['page']);
-
-//layui版本路径,方便后期切换版本
-$layui['js']  = $libs.'/Layui/v2.8.3/layui.js';$layui['css'] = $libs.'/Layui/v2.8.3/css/layui.css';
-$Ver = !Debug?SysVer:SysVer.'.'.time();
-$LoginConfig = unserialize($USER_DB['LoginConfig']);
-define('offline',$global_config['offline'] == 1);
-define('is_login',is_login());
+$page = trim($_GET['page']); //获取请求参数
+$Ver = !Debug?SysVer:SysVer.'.'.time(); //版本
+$LoginConfig = unserialize($USER_DB['LoginConfig']); //登录配置
+define('offline',$global_config['offline'] == 1); //是否离线模式
+define('is_login',is_login()); //是否已登录
 //未登录,载入登录提示页
 if(!is_login){
    require(DIR.'/templates/admin/page/LoginPrompt.php');
@@ -253,18 +249,18 @@ if(!empty($page)){
 function load_static($type){
    if($type == 'css'){
        echo 
-'<link rel="stylesheet" href="'.$GLOBALS['libs'].'/Layui/v2.8.3/css/layui.css" media="all">
+'<link rel="stylesheet" href="'.$GLOBALS['layui']['css'].'" media="all">
    <link rel="stylesheet" href="./templates/admin/css/public.css?v='.$GLOBALS['Ver'].'" media="all">
 ';
    }elseif($type == 'js'){
        echo 
-'<script src="'.$GLOBALS['libs'].'/Layui/v2.8.3/layui.js" charset="utf-8"></script>
+'<script src="'.$GLOBALS['layui']['js'].'" charset="utf-8"></script>
 <script src="./templates/admin/js/lay-config.js?v='.$GLOBALS['Ver'].'" charset="utf-8"></script>
 <script>layui.config({version:"'.$GLOBALS['Ver'].'"})</script>
 ';
    }elseif($type == 'js.layui'){
        echo 
-'<script src="'.$GLOBALS['libs'].'/Layui/v2.8.3/layui.js" charset="utf-8"></script>
+'<script src="'.$GLOBALS['layui']['js'].'" charset="utf-8"></script>
 <script>layui.config({version:"'.$GLOBALS['Ver'].'"})</script>
 ';
    }
--- a/system/api.php
+++ b/system/api.php
@@ -514,7 +514,9 @@ function write_link(){
            }
            //删除图标(如果是本地图标则同时删除文件)
            if(preg_match("/^\.\/data\/user\/{$u}\/favicon\//",$link['icon']) && is_file($link['icon'])){
-                @unlink($link['icon']);
+                if(!has_db('user_links',['uid'=>UID,'lid[!]'=>$link['lid'],'icon'=>$link['icon'] ])){ //判断是否共用
+                    @unlink($link['icon']);
+                }
            }
            //更新记录
            update_db('user_links',['icon'=>''],['uid'=>UID,'lid'=>$_POST['link_id']],[1,'删除成功']);
@@ -603,7 +605,9 @@ function write_link(){
            
        //如果存在本地图标,则先删除
        if(!empty($link['icon']) && preg_match("/^\.\/data\/user\/{$u}\/favicon\//",$link['icon']) && is_file($link['icon'])){
-            @unlink($link['icon']);
+            if(!has_db('user_links',['uid'=>UID,'lid[!]'=>$link['lid'],'icon'=>$link['icon'] ])){ //判断是否共用
+                @unlink($link['icon']);
+            }
        }
        //删除数据
        delete_db('user_links',['uid'=>UID ,"lid" => intval($_POST['lid'])],[1,'删除成功']);
--- a/system/expand/apply.php
+++ b/system/expand/apply.php
@@ -1,6 +1,5 @@
 <?php 
 $apply = $global_config['apply'];
-
 // 如果管理了收录功能则返回404
 if ($apply != 1 ){
    load_tip();
--- a/system/install.php
+++ b/system/install.php
@@ -339,7 +339,7 @@ function Write_Config(){
 	<meta charset="utf-8" />
 	<title>TwoNav 安装引导</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-	<link rel='stylesheet' href='<?php echo $libs?>/Layui/v2.8.3/css/layui.css'>
+	<link rel='stylesheet' href='<?php echo $layui['css']; ?>'>
 	<style>
 	    body{ background-color:rgba(0, 0, 51, 0.8); }
 	    .login-logo h1 { color:#FFFFFF; text-align: center; }
@@ -433,7 +433,7 @@ function Write_Config(){
 </div>
 </div>
 <script src = '<?php echo $libs?>/jquery/jquery-3.6.0.min.js'></script>
-<script src = '<?php echo $libs?>/Layui/v2.8.3/layui.js'></script>
+<script src = '<?php echo $layui['js']; ?>'></script>
 <script>

 var file = "data_" + Date.now() + '_' + getRandomString(20) + ".db3" //生成文件名
--- a/system/version.txt
+++ b/system/version.txt
@@ -1 +1 @@
-v2.0.20-20230520
+v2.0.21-20230521
--- a/templates/admin/js/category.js
+++ b/templates/admin/js/category.js
@@ -92,7 +92,7 @@
    //行点击事件
    table.on('row(table)', function(obj) {
 	    obj.tr.addClass('layui-bg-black').siblings().removeClass('layui-bg-black');
-	    obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
+	    obj.tr.find('i[class="layui-anim layui-icon layui-icon-circle"]').trigger("click");
        $("#Tips").text('当前选中: ' + obj.data.name);
    });
    
--- a/templates/admin/js/link_list.js
+++ b/templates/admin/js/link_list.js
@@ -25,9 +25,9 @@ layui.use(['form','table','dropdown','miniTab'], function () {
        });
    }

-    var cols=[[ //表头
+    var cols=[ //表头
      {type:'checkbox'} //开启复选框
-      ,{field: 'lid', title: 'ID', width:80, sort: true,hide:false}
+      ,{field: 'lid', title: 'ID', width:80, sort: true,hide:true}
      ,{field: 'category_name', title: '所属分类',sort:true,width:140,event: 'edit_category',templet:function(d){
          //检查是否存在,避免特殊情况报错
          if (categorys && categorys[d.fid] && categorys[d.fid].font_icon && categorys[d.fid].name) { 
@@ -58,8 +58,15 @@ layui.use(['form','table','dropdown','miniTab'], function () {
      ,{field: 'up_time', title: '修改时间', width:160,sort:true,templet:function(d){
          return d.up_time == null ?'':timestampToTime(d.up_time);
      }}
-    ]];
-    
+    ];
+    //读取列筛选
+    var local = layui.data('table-filter-link-list'); 
+    layui.each(cols, function(index, item){
+        if(item.field in local){
+            item.hide = local[item.field];
+        }
+    });
+
    //渲染表格函数
    var renderTable2 = function () {
        table.render({
@@ -74,7 +81,7 @@ layui.use(['form','table','dropdown','miniTab'], function () {
            //,defaultToolbar:false
            ,toolbar: '#toolbar'
            ,id:'table'
-            ,cols: cols
+            ,cols: [cols]
            ,method: 'post'
            ,response: {statusCode: 1 } 
            ,done: function (res, curr, count) {
@@ -105,6 +112,14 @@ layui.use(['form','table','dropdown','miniTab'], function () {
                        }
                    }
                });
+                //记忆列筛选
+                var that = this;
+                that.elem.next().on('mousedown', 'input[lay-filter="LAY_TABLE_TOOL_COLS"]+', function(){
+                    var input = $(this).prev()[0];
+                    layui.data('table-filter-link-list', {
+                        key: input.name,value: input.checked
+                    });
+                });
            }
        });
    };
--- a/templates/admin/js/link_sort.js
+++ b/templates/admin/js/link_sort.js
@@ -60,7 +60,7 @@ layui.use(['form','table'], function () {
    //行点击事件
    table.on('row(table)', function(obj) {
 	    obj.tr.addClass('layui-bg-black').siblings().removeClass('layui-bg-black');
-	    obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
+	    obj.tr.find('i[class="layui-anim layui-icon layui-icon-circle"]').trigger("click");
    });

    //监听工具栏
--- a/templates/admin/other/verify_link_pwd.php
+++ b/templates/admin/other/verify_link_pwd.php
@@ -12,7 +12,7 @@ $tip = $verify_type == 'link_pwd'?'请输入链接密码':'请输入分类密码
    <meta name="apple-mobile-web-app-status-bar-style" content="black">
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="format-detection" content="telephone=no">
-    <link rel="stylesheet" href="<?php echo $libs?>/Layui/v2.8.3/css/layui.css">
+    <link rel="stylesheet" href="<?php echo $layui['css']; ?>">
    <link rel="stylesheet" href="<?php echo $libs?>/Other/login.css">
    <!--[if lt IE 9]>
    <script src="<?php echo $libs?>/Other/html5.min.js"></script>
@@ -45,7 +45,7 @@ $tip = $verify_type == 'link_pwd'?'请输入链接密码':'请输入分类密码
     <?php echo $copyright.( !empty($ICP)?'<span class="padding-5">|</span>':'').$ICP; ?>
 </div>
 <script src = "<?php echo $libs?>/jquery/jquery-3.6.0.min.js"></script>
-<script src = "<?php echo $libs?>/Layui/v2.8.3/layui.js"></script>
+<script src = "<?php echo $layui['js']; ?>"></script>
 <script src = '<?php echo $libs?>/jquery/jquery.md5.js'></script>
 <script>
    layui.use(['form','jquery'], function () {
--- a/templates/admin/other/verify_pwd2.php
+++ b/templates/admin/other/verify_pwd2.php
@@ -12,7 +12,7 @@ $tip ='请输入二级密码';
    <meta name="apple-mobile-web-app-status-bar-style" content="black">
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="format-detection" content="telephone=no">
-    <link rel="stylesheet" href="<?php echo $libs?>/Layui/v2.8.3/css/layui.css">
+    <link rel="stylesheet" href="<?php echo $layui['css']; ?>">
    <link rel="stylesheet" href="<?php echo $libs?>/Other/login.css">
    <!--[if lt IE 9]>
    <script src="<?php echo $libs?>/Other/html5.min.js"></script>
@@ -45,7 +45,7 @@ $tip ='请输入二级密码';
     <?php echo $copyright.( !empty($ICP)?'<span class="padding-5">|</span>':'').$ICP; ?>
 </div>
 <script src = "<?php echo $libs?>/jquery/jquery-3.6.0.min.js"></script>
-<script src = "<?php echo $libs?>/Layui/v2.8.3/layui.js"></script>
+<script src = "<?php echo $layui['js']; ?>"></script>
 <script src = '<?php echo $libs?>/jquery/jquery.md5.js'></script>
 <script>
    layui.use(['form','jquery'], function () {
--- a/templates/admin/other/verify_share_pwd.php
+++ b/templates/admin/other/verify_share_pwd.php
@@ -10,7 +10,7 @@
    <meta name="apple-mobile-web-app-status-bar-style" content="black">
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="format-detection" content="telephone=no">
-    <link rel="stylesheet" href="<?php echo $libs?>/Layui/v2.8.3/css/layui.css">
+    <link rel="stylesheet" href="<?php echo $layui['css']; ?>">
    <link rel="stylesheet" href="<?php echo $libs?>/Other/login.css">
    <!--[if lt IE 9]>
    <script src="<?php echo $libs?>/Other/html5.min.js"></script>
@@ -43,7 +43,7 @@
     <?php echo $copyright.( !empty($ICP)?'<span class="padding-5">|</span>':'').$ICP; ?>
 </div>
 <script src = "<?php echo $libs?>/jquery/jquery-3.6.0.min.js"></script>
-<script src = "<?php echo $libs?>/Layui/v2.8.3/layui.js"></script>
+<script src = "<?php echo $layui['js']; ?>"></script>
 <script>
    layui.use(['form','jquery'], function () {
        var $ = layui.jquery,
--- a/templates/admin/page/add_quick_tpl.php
+++ b/templates/admin/page/add_quick_tpl.php
@@ -11,7 +11,7 @@
 	<meta name="HandheldFriendly" content="true">
 	<title>快速添加</title>
 	<link rel="stylesheet" type="text/css" href="./templates/admin/css/add_quick_tpl.css" />
-	<link rel="stylesheet" type="text/css" href="<?php echo $libs?>/Layui/v2.8.3/css/layui.css" />
+	<link rel="stylesheet" type="text/css" href="<?php echo $layui['css']; ?>" />
 </head>
 <body>
 	<div class="quick-main">
@@ -35,7 +35,7 @@
 		</form>
 	</div>
    <script src="<?php echo $libs?>/jquery/jquery-3.6.0.min.js" type="text/javascript" charset="utf-8"></script>
-	<script src="<?php echo $libs?>/Layui/v2.8.3/layui.js" type="text/javascript" charset="utf-8"></script>
+	<script src="<?php echo $layui['js']; ?>" type="text/javascript" charset="utf-8"></script>
 	<script>
 		var u = '<?php echo $u?>';
 		var Auto_Off = Get('Auto_Off');
--- a/templates/admin/page/expand/apply-admin.php
+++ b/templates/admin/page/expand/apply-admin.php
@@ -183,7 +183,7 @@ layui.use(['element','table','layer','form','util','dropdown'], function(){
    
    form.val('conf', <?php echo json_encode($data);?>);
 //表头
-var cols=[[
+var cols=[
      //{type:'checkbox'}, //开启复选框
      {field:'id',title:'ID',width:60,sort:true}
      ,{field:'iconurl',title:'图标',width:60,templet:function(d){
@@ -220,7 +220,14 @@ var cols=[[
          }
      }} 
      ,{title:'操作',toolbar:'#link_operate',width:130}
-    ]]
+    ]
+    //读取列筛选
+    var local = layui.data('table-filter-apply-list'); 
+    layui.each(cols, function(index, item){
+        if(item.field in local){
+            item.hide = local[item.field];
+        }
+    });
 //表渲染
 table.render({
    elem: '#apply_list'
@@ -232,7 +239,7 @@ table.render({
    ,loading:true
    ,toolbar: '#user_tool'
    ,id:'apply_list'
-    ,cols: cols
+    ,cols: [cols]
    ,response: {statusCode: 1 } 
    ,done: function (res, curr, count) {
        var temp_limit = $(".layui-laypage-limits option:selected").val();
@@ -240,6 +247,14 @@ table.render({
            localStorage.setItem(u + "_limit",temp_limit);
        }
        $(".layui-table-tool-self").addClass('layui-hide-xs');//手机端隐藏defaultToolbar
+        //记忆列筛选
+        var that = this;
+        that.elem.next().on('mousedown', 'input[lay-filter="LAY_TABLE_TOOL_COLS"]+', function(){
+            var input = $(this).prev()[0];
+            layui.data('table-filter-apply-list', {
+                key: input.name,value: input.checked
+            });
+        });
    }
 });

--- a/templates/admin/page/expand/apply-user.php
+++ b/templates/admin/page/expand/apply-user.php
@@ -4,7 +4,7 @@
 	<meta charset="utf-8" />
 	<title>申请收录</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-	<link rel='stylesheet' href='<?php echo $libs?>/Layui/v2.8.3/css/layui.css'>
+	<link rel='stylesheet' href='<?php echo $layui['css']; ?>'>
 	<style>
 	    /*body {*/
 	    /*    background:url(<?php echo $libs;?>/Other/bg.png) 0% 0% / cover no-repeat;*/
@@ -80,7 +80,7 @@
 </div>
 <script src = '<?php echo $libs?>/jquery/jquery-3.6.0.min.js'></script>
 <script src = '<?php echo $libs?>/jquery/jquery.md5.js'></script>
-<script src = '<?php echo $libs?>/Layui/v2.8.3/layui.js'></script>
+<script src = '<?php echo $layui['js']; ?>'></script>
 <script>
 layui.use(['form'], function(){
    var form = layui.form;
--- a/templates/admin/page/expand/guestbook-user.php
+++ b/templates/admin/page/expand/guestbook-user.php
@@ -5,7 +5,7 @@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
  <title>极简留言板</title>
-  <link rel='stylesheet' href='<?php echo $libs?>/Layui/v2.8.3/css/layui.css'>
+  <link rel='stylesheet' href='<?php echo $layui['css']; ?>'>
  <style>    
    .layui-form-item {
        margin-bottom: 10px;
@@ -66,7 +66,7 @@
 <!-- 内容主题区域END -->
 </div>
 <script src = '<?php echo $libs?>/jquery/jquery-3.6.0.min.js'></script>
-<script src = '<?php echo $libs?>/Layui/v2.8.3/layui.js'></script>
+<script src = '<?php echo $layui['js']; ?>'></script>
 <script>
 layui.use(['form'], function(){
    var form = layui.form;
--- a/templates/admin/page/updatelog.php
+++ b/templates/admin/page/updatelog.php
@@ -2,6 +2,18 @@
 <body>
 <div class="layuimini-container">
 <div class="layuimini-main" style=" margin-left: 20px;">
+    <li class="layui-timeline-item">
+        <i class="layui-icon layui-timeline-axis"></i>
+        <div class="layui-timeline-content layui-text">
+            <h4 class="layui-timeline-title">v2.0.21-20230521</h4>
+            <ul>
+                <li>[修复] 升级Layui导致的分类/链接排序功能异常</li>
+                <li>[修复] 升级Layui导致的主题设置异常,请更新主题 (影响范围:全新安装≥2.0.20)</li>
+                <li>[优化] 删除链接/图标时若存在本地图标共用的情况则不删除图标</li>
+                <li>[优化] 链接/收录列表,支持记忆筛选列 (浏览器本地储存)</li>
+            </ul>
+        </div>
+    </li>
    <li class="layui-timeline-item">
        <i class="layui-icon layui-timeline-axis"></i>
        <div class="layui-timeline-content layui-text">
--- a/templates/guide/default/config.php
+++ b/templates/guide/default/config.php
@@ -4,7 +4,7 @@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
  <title><?php echo $theme;?> - 主题配置</title>
-  <link rel='stylesheet' href='<?php echo $libs?>/Layui/v2.8.3/css/layui.css'>
+  <link rel='stylesheet' href='<?php echo $layui['css']; ?>'>
 </head>
 <body>
 <div class="layui-row" style = "margin-top:18px;">
@@ -43,7 +43,7 @@
 </div>
 </div>
 <script src = '<?php echo $libs?>/jquery/jquery-3.6.0.min.js'></script>
-<script src = '<?php echo $libs?>/Layui/v2.8.3/layui.js'></script>
+<script src = '<?php echo $layui['js']; ?>'></script>
 <script src = "./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>

 <script>
--- a/templates/home/default/config.php
+++ b/templates/home/default/config.php
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 		<title>
 			<?php echo $theme;?> - 主题配置</title>
-		<link rel='stylesheet' href='<?php echo $libs?>/Layui/v2.8.3/css/layui.css'>
+		<link rel='stylesheet' href='<?php echo $layui['css']; ?>'>
 		<style>
 			.layui-form-item {
                margin-bottom: 5px;
@@ -280,7 +280,7 @@
 			</div>
 		</div>
 <script src = '<?php echo $libs?>/jquery/jquery-3.6.0.min.js'></script>
-<script src="<?php echo $libs?>/Layui/v2.8.3/layui.js"></script>
+<script src="<?php echo $layui['js']; ?>"></script>
 <script src="./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>
 <script src="./templates/admin/js/lay-config.js?v=<?php echo $Ver;?>" charset="utf-8"></script>
 <script>
--- a/templates/home/default/index.php
+++ b/templates/home/default/index.php
@@ -35,7 +35,6 @@ if ($DescrRowNumber <= 0 ){
 <link rel='stylesheet' href='<?php echo $libs?>/MDUI/v1.0.1/css/mdui.min.css'>
 <link rel='stylesheet' href='<?php echo $libs?>/ContextMenu/2.9.2/jquery.contextMenu.min.css'>
 <link rel="stylesheet" href="<?php echo $libs?>/Font-awesome/4.7.0/css/font-awesome.css">
-<link rel="stylesheet" href="<?php echo $libs?>/Layui/v2.8.3/css/layui-icon.css">
 <link rel="stylesheet" href="<?php echo $theme_dir?>/static/style<?php echo $theme_config['CardNum'];?>.css?v=<?php echo $theme_ver; ?>">
 <link rel="shortcut icon" href="<?php echo $favicon;?>">
 <style>
--- a/templates/home/default/info.json
+++ b/templates/home/default/info.json
@@ -2,8 +2,8 @@
    "name":"默认主题(加强)",
    "description":"默认主题(加强)",
    "homepage":"https://gitee.com/tznb/OneNav",
-    "version":"2.0.1",
-    "update":"2023/04/25",
+    "version":"2.0.2",
+    "update":"2023/05/20",
    "author":"落幕",
    "screenshot":"https://s3.bmp.ovh/imgs/2022/04/17/8cac968a8cc8135c.png",
    "config": {
--- a/templates/login/default/index.php
+++ b/templates/login/default/index.php
@@ -10,7 +10,7 @@
    <meta name="apple-mobile-web-app-status-bar-style" content="black">
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="format-detection" content="telephone=no">
-    <link rel="stylesheet" href="<?php echo $libs?>/Layui/v2.8.3/css/layui.css">
+    <link rel="stylesheet" href="<?php echo $layui['css']; ?>">
    <link rel="stylesheet" href="<?php echo $libs?>/Other/login.css">
    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon">
    <!--[if lt IE 9]>
@@ -58,7 +58,7 @@
     <?php echo $copyright.( !empty($ICP)?'<span class="padding-5">|</span>':'').$ICP; ?>
 </div>
 <script src = "<?php echo $libs?>/jquery/jquery-3.6.0.min.js"></script>
-<script src = "<?php echo $libs?>/Layui/v2.8.3/layui.js"></script>
+<script src = "<?php echo $layui['js']; ?>"></script>
 <script src = '<?php echo $libs?>/jquery/jquery.md5.js'></script>
 <script>
    layui.use(['form','jquery'], function () {
--- a/templates/register/default/index.php
+++ b/templates/register/default/index.php
@@ -16,7 +16,7 @@ if(!empty($mail_config)){
    <meta name="apple-mobile-web-app-status-bar-style" content="black">
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="format-detection" content="telephone=no">
-    <link rel="stylesheet" href="<?php echo $libs?>/Layui/v2.8.3/css/layui.css">
+    <link rel="stylesheet" href="<?php echo $layui['css']; ?>">
    <link rel="stylesheet" href="<?php echo $libs?>/Other/login.css">
    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon">
    <!--[if lt IE 9]>
@@ -86,7 +86,7 @@ if(!empty($mail_config)){
     <?php echo $copyright.( !empty($ICP)?'<span class="padding-5">|</span>':'').$ICP; ?>
 </div>
 <script src = "<?php echo $libs?>/jquery/jquery-3.6.0.min.js"></script>
-<script src = "<?php echo $libs?>/Layui/v2.8.3/layui.js"></script>
+<script src = "<?php echo $layui['js']; ?>"></script>
 <script src = '<?php echo $libs?>/jquery/jquery.md5.js'></script>
 <script>
    layui.use(['form','jquery'], function () {
--- a/templates/transit/default/config.php
+++ b/templates/transit/default/config.php
@@ -4,7 +4,7 @@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
  <title><?php echo $theme;?> - 主题配置</title>
-  <link rel='stylesheet' href='<?php echo $libs?>/Layui/v2.8.3/css/layui.css'>
+  <link rel='stylesheet' href='<?php echo $layui['css']; ?>'>
  <style>    
    .layui-form-item {
        margin-bottom: 10px;
@@ -66,7 +66,7 @@
 </div>
 </div>
 <script src = '<?php echo $libs?>/jquery/jquery-3.6.0.min.js'></script>
-<script src = '<?php echo $libs?>/Layui/v2.8.3/layui.js'></script>
+<script src = '<?php echo $layui['js']; ?>'></script>
 <script src = "./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>

 <script>