diff --git a/README.md b/README.md index 17dd7ca..1ddb7e5 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ * 后台:http://adm.aieok.com * 账号:test * 密码:test123 - * 版本:TaoLer 1.7.17 - * 日期:2021.7.16 + * 版本:TaoLer 1.7.20 + * 日期:2021.7.20 #### 项目地址 diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php index 3b98297..8dbf82d 100644 --- a/app/index/controller/Index.php +++ b/app/index/controller/Index.php @@ -72,6 +72,8 @@ class Index extends BaseController //搜索功能 public function search() { + //$t = input('keywords'); + //halt($t); $ser = Request::only(['keywords']); $search = new \app\index\controller\Search(); diff --git a/app/install/data/taoler.sql b/app/install/data/taoler.sql index f322d7c..0ce7ed8 100644 --- a/app/install/data/taoler.sql +++ b/app/install/data/taoler.sql @@ -193,7 +193,7 @@ INSERT INTO `tao_auth_rule` VALUES ('13', 'admin/Admin/repass', '修改密码', INSERT INTO `tao_auth_rule` VALUES ('15', 'admin/Forum/list', '帖子管理', '', '1', '1', '5', '1', '', '1', '1', '', '0', '1578902605', '0'); INSERT INTO `tao_auth_rule` VALUES ('16', 'admin/Forum/tags', '分类管理', '', '1', '1', '5', '1', '', '1', '11', '', '0', '1578904950', '0'); INSERT INTO `tao_auth_rule` VALUES ('17', 'admin/Forum/replys', '评论管理', '', '1', '1', '5', '1', '', '1', '7', '', '0', '1578904590', '0'); -INSERT INTO `tao_auth_rule` VALUES ('18', 'admin/Slider/index', '广告投放', '', '1', '1', '93', '1', '', '1', '4', '', '0', '1611999603', '0'); +INSERT INTO `tao_auth_rule` VALUES ('18', 'admin/Slider/index', '链接投放', '', '1', '1', '93', '1', '', '1', '4', '', '0', '1611999603', '0'); INSERT INTO `tao_auth_rule` VALUES ('19', 'admin/Upgrade/index', '系统升级', '', '1', '1', '2', '1', '', '1', '8', '', '0', '0', '0'); INSERT INTO `tao_auth_rule` VALUES ('21', 'admin/Forum/listform', '编辑帖子', '', '1', '1', '15', '2', '', '0', '2', '', '0', '1611997428', '0'); INSERT INTO `tao_auth_rule` VALUES ('22', 'admin/Forum/listdel', '删除帖子', '', '1', '1', '15', '2', '', '0', '3', '', '0', '1611997448', '0'); @@ -220,10 +220,10 @@ INSERT INTO `tao_auth_rule` VALUES ('48', 'admin/AuthRule/delete', '删除权限 INSERT INTO `tao_auth_rule` VALUES ('49', 'admin/AuthRule/check', '审核权限', '', '1', '1', '9', '2', '', '0', '19', '', '0', '1611997884', '0'); INSERT INTO `tao_auth_rule` VALUES ('50', 'admin/AuthRule/menushow', '菜单权限', '', '1', '1', '9', '2', '', '0', '20', '', '0', '1611997929', '0'); INSERT INTO `tao_auth_rule` VALUES ('51', 'admin/Set/upload', '上传logo', '', '1', '1', '10', '2', '', '0', '2', '', '0', '1611998097', '0'); -INSERT INTO `tao_auth_rule` VALUES ('52', 'admin/Slider/add', '添加广告', '', '1', '1', '18', '2', '', '0', '5', '', '0', '1611998128', '0'); -INSERT INTO `tao_auth_rule` VALUES ('53', 'admin/Slider/edit', '编辑广告', '', '1', '1', '18', '2', '', '0', '14', '', '0', '1611998263', '0'); -INSERT INTO `tao_auth_rule` VALUES ('54', 'admin/Slider/delete', '删除广告', '', '1', '1', '18', '2', '', '0', '6', '', '0', '1611998141', '0'); -INSERT INTO `tao_auth_rule` VALUES ('55', 'admin/Slider/uploadimg', '上传广告图片', '', '1', '1', '18', '2', '', '0', '7', '', '0', '1611998156', '0'); +INSERT INTO `tao_auth_rule` VALUES ('52', 'admin/Slider/add', '添加链接', '', '1', '1', '18', '2', '', '0', '5', '', '0', '1611998128', '0'); +INSERT INTO `tao_auth_rule` VALUES ('53', 'admin/Slider/edit', '编辑链接', '', '1', '1', '18', '2', '', '0', '14', '', '0', '1611998263', '0'); +INSERT INTO `tao_auth_rule` VALUES ('54', 'admin/Slider/delete', '删除链接', '', '1', '1', '18', '2', '', '0', '6', '', '0', '1611998141', '0'); +INSERT INTO `tao_auth_rule` VALUES ('55', 'admin/Slider/uploadimg', '上传链接图片', '', '1', '1', '18', '2', '', '0', '7', '', '0', '1611998156', '0'); INSERT INTO `tao_auth_rule` VALUES ('56', 'admin/Upgrade/key', '设置key', '', '1', '1', '19', '2', '', '0', '9', '', '0', '1611998178', '0'); INSERT INTO `tao_auth_rule` VALUES ('57', 'admin/Upgrade/keyedit', '修改key', '', '1', '1', '19', '2', '', '0', '10', '', '0', '1611998192', '0'); INSERT INTO `tao_auth_rule` VALUES ('58', 'admin/Upgrade/check', '升级检测', '', '1', '1', '19', '2', '', '0', '11', '', '0', '1611998214', '0'); diff --git a/config/taoler.php b/config/taoler.php index 8d13ff8..58e912c 100644 --- a/config/taoler.php +++ b/config/taoler.php @@ -7,7 +7,7 @@ return [ //应用名,此项不可更改 'appname' => 'TaoLer', //版本配置 - 'version' => '1.7.19', + 'version' => '1.7.20', //加盐 'salt' => 'taoler', //数据库备份目录 diff --git a/public/static/res/css/global.css b/public/static/res/css/global.css index 9165dc4..f5572c5 100644 --- a/public/static/res/css/global.css +++ b/public/static/res/css/global.css @@ -27,14 +27,21 @@ i{font-style: normal;} @media screen and (max-width: 992px) { .site-menu{position: fixed; top: 0px; bottom: 0; min-height: 0; overflow-y: auto; overflow-x: hidden; z-index: 10001; left: -300px; background-color: #fff; transition: all .3s;} - + /* 头部伸缩菜单栏 */ + .site-tree-mobile-top{display: block!important; position: fixed; z-index: 16666668; top: 2px; left: 20px; width: 57px; height: 57px; line-height: 57px; border-radius: 2px; text-align: center; color: #fff;} + .site-home .site-tree-mobile-top{display: none!important;} + .site-mobile .site-tree-mobile-top{display: none !important;} + .site-mobile .site-menu{left: 0;} + .site-mobile .site-mobile-shade-top{content: ''; position: fixed; top: 0; bottom: 0; left: 0; right: 0; z-index: 999;} + .site-tree-mobile-top i{font-size: 30px;} + + /* 底部伸缩菜单栏 */ .site-tree-mobile{display: block!important; position: fixed; z-index: 16666669; bottom: 15px; left: 15px; width: 30px; height: 30px; line-height: 30px; border-radius: 2px; text-align: center; background-color: #009688; color: #fff;} .site-home .site-tree-mobile{display: none!important;} .site-mobile .site-tree-mobile{display: none !important;} - .site-mobile .site-menu{left: 0;} .site-mobile .site-mobile-shade{content: ''; position: fixed; top: 0; bottom: 0; left: 0; right: 0; background-color: rgba(0,0,0,.8); z-index: 999;} .site-tree-mobile i{font-size: 20px;} - + .site-mobile .layui-side{left: 0;} .site-mobile .layui-side-child{top: 50%; left: 200px; height: 300px; margin-top: -100px;} @@ -550,7 +557,7 @@ body .layui-edit-face .layui-layer-content{padding:0; background-color:#fff; co /* 用户中心 */ body .fly-user-main{position: relative; min-height: 600px;} -.fly-user-main>.layui-nav{position: absolute; left: 0; top: 0; z-index: 1000; height: 100%; padding: 10px 0;} +.fly-user-main>.layui-nav{position: absolute; left: 0; top: 0; z-index: 10000; height: 100%; padding: 2px 0;} .fly-user-main>.layui-nav .layui-icon{position: relative; top: 2px; font-size: 20px; margin-right: 10px;} .fly-user-main>.fly-panel{min-height: 575px; margin: 0 0 10px 215px;} .fly-user-main .fly-none{min-height: 0;} diff --git a/public/static/res/mods/index.js b/public/static/res/mods/index.js index 91a639b..55e3e77 100644 --- a/public/static/res/mods/index.js +++ b/public/static/res/mods/index.js @@ -940,6 +940,9 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'imgcom'], } }) }); + + //移动端搜索 + //新消息通知 fly.newmsg(); @@ -1011,7 +1014,7 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'imgcom'], elem: '.fly-editor' }); - //手机设备的简单适配 + //手机设备的简单适配 底部左侧栏导航 var treeMobile = $('.site-tree-mobile') ,shadeMobile = $('.site-mobile-shade') @@ -1023,6 +1026,18 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'imgcom'], $('body').removeClass('site-mobile'); }); + //手机设备的简单适配 头部左侧栏导航 + var treeMobileTop = $('.site-tree-mobile-top') + ,shadeMobileTop = $('.site-mobile-shade-top') + + treeMobileTop.on('click', function(){ + $('body').addClass('site-mobile'); + }); + + shadeMobileTop.on('click', function(){ + $('body').removeClass('site-mobile'); + }); + //导航窗口scroll ;!function(){ var main = $('.site-menu'), scroll = function(){ @@ -1096,7 +1111,7 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'imgcom'], }); }); - //监听多语言切换 + //pc端监听多语言切换 $('#language').on('change',function(){ var data = $(this).val(); $.post(langUrl,{language:data},function(res){ @@ -1106,6 +1121,16 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'imgcom'], }); return false; }); + //移动端左侧栏监听多语言切换 + $('#language1').on('change',function(){ + var data = $(this).val(); + $.post(langUrl,{language:data},function(res){ + if(res.code == 0){ + location.reload(); + } + }); + return false; + }); //固定Bar util.fixbar({ diff --git a/public/static/res/mods/user.js b/public/static/res/mods/user.js index 1efdd88..a90d279 100644 --- a/public/static/res/mods/user.js +++ b/public/static/res/mods/user.js @@ -291,14 +291,14 @@ layui.define(['laypage', 'fly', 'element', 'flow', 'imgcom'], function(exports){ //手机设备的简单适配 - var treeMobile = $('.site-tree-mobile-user') - ,shadeMobile = $('.site-mobile-shade-user') + var treeMobileUser = $('.site-tree-mobile-user') + ,shadeMobileUser = $('.site-mobile-shade-user') - treeMobile.on('click', function(){ + treeMobileUser.on('click', function(){ $('body').addClass('site-mobile'); }); - shadeMobile.on('click', function(){ + shadeMobileUser.on('click', function(){ $('body').removeClass('site-mobile'); }); diff --git a/view/taoler/index/article/add.html b/view/taoler/index/article/add.html index 6f93348..eef2791 100644 --- a/view/taoler/index/article/add.html +++ b/view/taoler/index/article/add.html @@ -4,6 +4,7 @@ {block name="link"}{/block} {block name="column"}{/block} {block name="content"} +
{include file="public/menu" /}
diff --git a/view/taoler/index/article/cate.html b/view/taoler/index/article/cate.html index c0a9d03..32a9c56 100644 --- a/view/taoler/index/article/cate.html +++ b/view/taoler/index/article/cate.html @@ -7,10 +7,7 @@ {block name="content"}
-
- {include file="public/menu" /} -
- +
{include file="public/menu" /}
diff --git a/view/taoler/index/article/detail.html b/view/taoler/index/article/detail.html index 1c0b910..f115dbc 100644 --- a/view/taoler/index/article/detail.html +++ b/view/taoler/index/article/detail.html @@ -8,9 +8,7 @@ {block name="content"}
-
- {include file="public/menu" /} -
+
{include file="public/menu" /}
diff --git a/view/taoler/index/article/edit.html b/view/taoler/index/article/edit.html index 9c00d12..c58c9b9 100644 --- a/view/taoler/index/article/edit.html +++ b/view/taoler/index/article/edit.html @@ -4,6 +4,7 @@ {block name="link"}{/block} {block name="column"}{/block} {block name="content"} +
{include file="public/menu" /}
diff --git a/view/taoler/index/doc/timeline.html b/view/taoler/index/doc/timeline.html index 20f7109..2d2275d 100644 --- a/view/taoler/index/doc/timeline.html +++ b/view/taoler/index/doc/timeline.html @@ -8,7 +8,7 @@ {block name="content"}
- +
{include file="public/menu" /}
diff --git a/view/taoler/index/index/index.html b/view/taoler/index/index/index.html index 01dd8fd..cd482ad 100644 --- a/view/taoler/index/index/index.html +++ b/view/taoler/index/index/index.html @@ -8,10 +8,7 @@ {block name="content"}
-
- {include file="public/menu" /} -
- +
{include file="public/menu" /}
diff --git a/view/taoler/index/index/search.html b/view/taoler/index/index/search.html index c1ff603..d902c1e 100644 --- a/view/taoler/index/index/search.html +++ b/view/taoler/index/index/search.html @@ -1,16 +1,14 @@ - {extend name="public/base" /} {block name="title"}{$sysInfo.webname}{$keywords}搜索内容{/block} - -{block name="column"} -{include file="/public/column" /} -{/block} +{block name="column"}{include file="public/column" /}{/block} {block name="content"}
- +
+ {include file="public/menu" /} +
@@ -57,7 +55,7 @@
本周热议
{volist name="artHot" id="vo" empty="还没有帖子"}
- {$vo.title} + {$vo.title} {$vo.comments_count}
{/volist} diff --git a/view/taoler/index/login/forget.html b/view/taoler/index/login/forget.html index bb30494..c45c13f 100644 --- a/view/taoler/index/login/forget.html +++ b/view/taoler/index/login/forget.html @@ -4,6 +4,7 @@ {block name="title"}{:lang('retrieve password')}{/block} {block name="column"}{/block} {block name="content"} +
{include file="public/menu" /}
diff --git a/view/taoler/index/login/login.html b/view/taoler/index/login/login.html index 399f45d..68a8e52 100644 --- a/view/taoler/index/login/login.html +++ b/view/taoler/index/login/login.html @@ -3,6 +3,7 @@ {block name="title"}用户登录{/block} {block name="column"}{/block} {block name="content"} +
{include file="public/menu" /}
diff --git a/view/taoler/index/login/reg.html b/view/taoler/index/login/reg.html index bcf9783..0c0f454 100644 --- a/view/taoler/index/login/reg.html +++ b/view/taoler/index/login/reg.html @@ -3,6 +3,7 @@ {block name="title"}注册账号{/block} {block name="column"}{/block} {block name="content"} +
{include file="public/menu" /}
diff --git a/view/taoler/index/public/header.html b/view/taoler/index/public/header.html index 8cc39f5..0ae48a0 100644 --- a/view/taoler/index/public/header.html +++ b/view/taoler/index/public/header.html @@ -1,65 +1,70 @@
+ +
+ +
+
+ diff --git a/view/taoler/index/public/menu.html b/view/taoler/index/public/menu.html index 45317a9..47a78e8 100644 --- a/view/taoler/index/public/menu.html +++ b/view/taoler/index/public/menu.html @@ -1,11 +1,11 @@
- - + diff --git a/view/taoler/index/user/home.html b/view/taoler/index/user/home.html index 76a76cc..8a79626 100644 --- a/view/taoler/index/user/home.html +++ b/view/taoler/index/user/home.html @@ -5,6 +5,9 @@ {block name="link"}{/block} {block name="column"}{/block} {block name="content"} +
+{include file="public/menu" /} +
{$u.name}