From 0c2f0154a81dd0a6268da627982d1bf41c0ef231 Mon Sep 17 00:00:00 2001 From: taoser Date: Mon, 3 Jul 2023 12:56:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=85=E5=AE=B9=E5=8A=A0?= =?UTF-8?q?=E5=AF=86=E6=B3=84=E9=9C=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/404.html | 6 +++--- app/admin/controller/addon/Addons.php | 6 ++++-- app/common/model/Article.php | 18 ++++++++++++++---- app/index/controller/Article.php | 5 ----- app/index/controller/User.php | 12 ++++++------ app/install/data/taoler.sql | 5 +++++ composer.lock | 14 +++++++------- config/taoler.php | 2 +- public/static/component/layui/css/layui.css | 2 +- public/static/component/layui/layui.js | 2 +- vendor/composer/installed.json | 16 ++++++++-------- vendor/composer/installed.php | 10 +++++----- vendor/services.php | 2 +- vendor/workerman/phpsocket.io/composer.json | 2 +- .../src/Engine/Protocols/WebSocket/RFC6455.php | 6 +++--- view/taoler/index/comment/edit.html | 2 +- view/taoler/index/login/login.html | 4 ++++ view/taoler/index/public/base.html | 6 +++--- view/taoler/index/public/menu.html | 7 ------- view/taoler/index/public/user.html | 6 +++--- 20 files changed, 71 insertions(+), 62 deletions(-) diff --git a/app/404.html b/app/404.html index 046541c..84cbca8 100644 --- a/app/404.html +++ b/app/404.html @@ -6,7 +6,7 @@ - + @@ -22,8 +22,8 @@ - - + + - + {:hook('taonyeditor')} diff --git a/view/taoler/index/login/login.html b/view/taoler/index/login/login.html index be4d3a4..aa552eb 100644 --- a/view/taoler/index/login/login.html +++ b/view/taoler/index/login/login.html @@ -94,5 +94,9 @@ return false; }); }); +// 更新验证码 + layui.jquery('#captcha').on('click',function(){ + layui.jquery('#captcha').attr('src', '{:captcha_src()}?'+Math.random()); + }) {/block} \ No newline at end of file diff --git a/view/taoler/index/public/base.html b/view/taoler/index/public/base.html index d92dbae..ec66e18 100644 --- a/view/taoler/index/public/base.html +++ b/view/taoler/index/public/base.html @@ -28,14 +28,14 @@ {block name="ogimage"} {/block} {block name="meta"}{/block} - - + + - + {block name="link"}{/block} diff --git a/view/taoler/index/public/menu.html b/view/taoler/index/public/menu.html index be7ed33..2fbf792 100644 --- a/view/taoler/index/public/menu.html +++ b/view/taoler/index/public/menu.html @@ -70,12 +70,5 @@ - - diff --git a/view/taoler/index/public/user.html b/view/taoler/index/public/user.html index 03d769f..6ade93b 100644 --- a/view/taoler/index/public/user.html +++ b/view/taoler/index/public/user.html @@ -16,17 +16,17 @@ - + {block name="css"}{/block} - + {include file="public/header" /}
{include file="public/user-nav" /} -
+
{block name="content"} {/block}