From d8d6ce1a156bf6e7a994b819103c0978a5a3db42 Mon Sep 17 00:00:00 2001 From: taoser Date: Mon, 24 May 2021 18:46:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- app/admin/controller/Upgrade.php | 9 ++++----- public/static/res/css/global.css | 2 +- public/static/res/mods/user.js | 22 ++++++---------------- view/taoler/index/public/user.html | 15 +++++++++++---- view/taoler/index/user/post.html | 10 ---------- 6 files changed, 23 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index a469eb7..1d1654d 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ * 后台：http://adm.aieok.com * 账号：test * 密码：test123 - * 版本：TaoLer 1.7.5 + * 版本：TaoLer 1.7.6 * 日期：2021.5.25 #### 项目地址 diff --git a/app/admin/controller/Upgrade.php b/app/admin/controller/Upgrade.php index aa09916..bf579da 100644 --- a/app/admin/controller/Upgrade.php +++ b/app/admin/controller/Upgrade.php @@ -221,11 +221,11 @@ class Upgrade extends AdminController Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'success','progress'=>'50%','msg'=>'升级文件解压成功！']); - + $upSql = $zipPath.'runtime/mysql_update.sql'; //升级执行mysql操作 - if(file_exists($zipPath.'mysql/mysql_update.sql')) + if(file_exists($upSql)) { - $result = $this->db_update($zipPath.'mysql/mysql_update.sql'); + $result = $this->db_update($upSql); if(!$result && $result < 0) { return json(['code'=>-1,'msg'=>'数据库升级失败']); @@ -256,10 +256,9 @@ class Upgrade extends AdminController } Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'success','progress'=>'70%','msg'=>'升级文件执行成功！']); //把解压的升级包清除 - //$del_zip = unlink($package_file); Files::delDirAndFile($this->upload_dir); Files::delDirAndFile($this->backup_dir); - Files::delDirAndFile("../mysql/"); + unlink('../runtime/mysql_update.sql'); Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'success','progress'=>'100%','msg'=>'升级成功！']); //更新系统的版本号了 diff --git a/public/static/res/css/global.css b/public/static/res/css/global.css index af48da7..f775758 100644 --- a/public/static/res/css/global.css +++ b/public/static/res/css/global.css @@ -723,7 +723,7 @@ body .fly-user-main{position: relative; min-height: 600px;} .site-tree-mobile-user{display: block!important; position: fixed; z-index: 100000; bottom: 20px; left: 10px; width: 50px; height: 50px; line-height: 50px; border-radius: 2px; text-align: center; background-color: rgba(0,0,0,.7); color: #fff;} .site-mobile .site-tree-mobile-user{display: none !important;} .site-mobile .fly-user-main>.layui-nav{left: 0;} - .site-mobile .site-mobile-shade-user{content: ''; position: fixed; top: 0; bottom: 0; left: 0; right: 0; background-color: rgba(0,0,0,.9); z-index: 999;} + .site-mobile .site-mobile-shade-user{content: ''; position: fixed; top: 0; bottom: 0; left: 0; right: 0; background-color: rgba(0,0,0,.8); z-index: 999;} } /*前台公用样式*/ diff --git a/public/static/res/mods/user.js b/public/static/res/mods/user.js index 6a0ca0a..aff6663 100644 --- a/public/static/res/mods/user.js +++ b/public/static/res/mods/user.js @@ -28,15 +28,15 @@ layui.define(['laypage', 'fly', 'element', 'flow'], function(exports){ //我的相关数据 - //发贴list + //发贴list var post = table.render({ elem: '#art-post' - ,url: artListUrl //进列表接口 + ,url: artListUrl ,title: '' ,cols: [[ {type: 'numbers', fixed: 'left'} - ,{field: 'title', title: '标题',minWidth: 250 ,templet: '
{{d.title}}
'} - ,{field: 'status', title: '状态', Width: 80} + ,{field: 'title', title: '标题',minWidth: 250 ,templet: '
{{d.title}}
'} + ,{field: 'status', title: '状态', width: 80} ,{field: 'ctime', title: '时间', width: 120} ,{field: 'datas', title: '数据', width: 120} ,{title: '操作', width: 150, align: 'center', toolbar: '#artTool'} @@ -48,11 +48,11 @@ layui.define(['laypage', 'fly', 'element', 'flow'], function(exports){ //收藏list table.render({ elem: '#coll-post' - ,url: collListUrl //进列表接口 + ,url: collListUrl ,title: '' ,cols: [[ {type: 'numbers', fixed: 'left'} - ,{field: 'title', title: '标题',minWidth: 250,templet: '
{{d.title}}
'} + ,{field: 'title', title: '标题',minWidth: 250,templet: '
{{d.title}}
'} ,{field: 'auther', title: '作者', width: 120} ,{field: 'ctime', title: '时间', width: 120} ,{title: '取消', width: 80, align: 'center', toolbar: '#collTool'} @@ -127,16 +127,6 @@ layui.define(['laypage', 'fly', 'element', 'flow'], function(exports){ }); } }); - - var elemUC = $('#LAY_uc'), elemUCM = $('#LAY_ucm'); - gather.minelog = {}; - - if(elemUC[0]){ - layui.each(dom.mine.children(), function(index, item){ - var othis = $(item) - gather.mine(index, othis.data('type'), othis.data('url')); - }); - } //显示当前tab if(location.hash){ diff --git a/view/taoler/index/public/user.html b/view/taoler/index/public/user.html index 2a9769e..093bd6b 100644 --- a/view/taoler/index/public/user.html +++ b/view/taoler/index/public/user.html @@ -1,4 +1,3 @@ - @@ -20,9 +19,16 @@ {block name="content"} {/block} - {include file="public/footer" /} - + +{include file="public/footer" /} {block name="script"} -js脚本 + {/block} \ No newline at end of file diff --git a/view/taoler/index/user/post.html b/view/taoler/index/user/post.html index 9235057..08eaf15 100644 --- a/view/taoler/index/user/post.html +++ b/view/taoler/index/user/post.html @@ -32,15 +32,5 @@ 取消 {/block} - {block name="script"} - {/block} \ No newline at end of file