peihaoyu/TaoLer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化菜单和移动端搜索

Browse Source
This commit is contained in:
taoser 2021-07-22 10:48:06 +08:00
parent 0c5943802e
commit 1b7f45a4e2
20 changed files with 128 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -7,8 +7,8 @@
* 后台：http://adm.aieok.com
* 账号：test
* 密码：test123
* 版本：TaoLer 1.7.17
* 日期：2021.7.16
* 版本：TaoLer 1.7.20
* 日期：2021.7.20
#### 项目地址

2
app/index/controller/Index.php
View File

@ -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();

10
app/install/data/taoler.sql
View File

@ -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');

2
config/taoler.php
View File

@ -7,7 +7,7 @@ return [
//应用名,此项不可更改
'appname' => 'TaoLer',
//版本配置
'version' => '1.7.19',
'version' => '1.7.20',
//加盐
'salt' => 'taoler',
//数据库备份目录

15
public/static/res/css/global.css
View File

@ -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;}

29
public/static/res/mods/index.js
View File

@ -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({

8
public/static/res/mods/user.js
View File

@ -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');
});

1
view/taoler/index/article/add.html
View File

@ -4,6 +4,7 @@
{block name="link"}<link rel="stylesheet" href="/static/res/css/plyr.css" charset="utf-8">{/block}
{block name="column"}{/block}
{block name="content"}
<div class="">{include file="public/menu" /}</div>
<div class="layui-container fly-marginTop">
<div class="fly-panel" pad20 style="padding-top: 5px;">
<!--<div class="fly-none">没有权限</div>-->

5
view/taoler/index/article/cate.html
View File

@ -7,10 +7,7 @@
{block name="content"}
<div class="layui-container">
<div class="layui-row layui-col-space15">
<div class="">
{include file="public/menu" /}
</div>
<div class="">{include file="public/menu" /}</div>
<div class="layui-col-md8">
<div class="fly-panel" style="margin-bottom: 0;">

4
view/taoler/index/article/detail.html
View File

@ -8,9 +8,7 @@
{block name="content"}
<div class="layui-container">
<div class="layui-row layui-col-space15">
<div class="">
{include file="public/menu" /}
</div>
<div class="">{include file="public/menu" /}</div>
<div class="layui-col-md8 content detail">
<div class="fly-panel detail-box">

1
view/taoler/index/article/edit.html
View File

@ -4,6 +4,7 @@
{block name="link"}<link rel="stylesheet" href="/static/res/css/plyr.css" charset="utf-8">{/block}
{block name="column"}{/block}
{block name="content"}
<div class="">{include file="public/menu" /}</div>
<div class="layui-container fly-marginTop">
<div class="fly-panel" pad20 style="padding-top: 5px;">
<!--<div class="fly-none">没有权限</div>-->

2
view/taoler/index/doc/timeline.html
View File

@ -8,7 +8,7 @@
{block name="content"}
<div class="layui-container">
<div class="layui-row layui-col-space15">
<div class="">{include file="public/menu" /}</div>
<div class="layui-col-md8">
<!--首页幻灯-->
<div class="fly-panel layui-hide-xs">

5
view/taoler/index/index/index.html
View File

@ -8,10 +8,7 @@
{block name="content"}
<div class="layui-container">
<div class="layui-row layui-col-space15">
<div class="">
{include file="public/menu" /}
</div>
<div class="">{include file="public/menu" /}</div>
<div class="layui-col-md8">
<!--首页幻灯-->
<div class="fly-panel">

12
view/taoler/index/index/search.html
View File

@ -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"}
<div class="layui-container">
<div class="layui-row layui-col-space15">
<div class="">
{include file="public/menu" /}
</div>
<div class="layui-col-md8">
<div class="fly-panel" style="margin-bottom: 0;">
<div class="fly-panel-title fly-filter">
@ -57,7 +55,7 @@
<dt class="fly-panel-title">本周热议</dt>
{volist name="artHot" id="vo" empty="还没有帖子"}
<dd>
<a href="{:url('jie/detail',['id'=>$vo.id])}">{$vo.title}</a>
<a href="{:url('article/detail',['id'=>$vo.id])}">{$vo.title}</a>
<span><i class="iconfont icon-pinglun1"></i> {$vo.comments_count}</span>
</dd>
{/volist}

1
view/taoler/index/login/forget.html
View File

@ -4,6 +4,7 @@
{block name="title"}{:lang('retrieve password')}{/block}
{block name="column"}{/block}
{block name="content"}
<div class="">{include file="public/menu" /}</div>
<div class="layui-container fly-marginTop">
<div class="fly-panel fly-panel-user" pad20>
<div class="layui-tab layui-tab-brief" lay-filter="user">

1
view/taoler/index/login/login.html
View File

@ -3,6 +3,7 @@
{block name="title"}用户登录{/block}
{block name="column"}{/block}
{block name="content"}
<div class="">{include file="public/menu" /}</div>
<div class="layui-container fly-marginTop">
<div class="fly-panel fly-panel-user" pad20>
<div class="layui-tab layui-tab-brief" lay-filter="user">

1
view/taoler/index/login/reg.html
View File

@ -3,6 +3,7 @@
{block name="title"}注册账号{/block}
{block name="column"}{/block}
{block name="content"}
<div class="">{include file="public/menu" /}</div>
<div class="layui-container fly-marginTop">
<div class="fly-panel fly-panel-user" pad20>
<div class="layui-tab layui-tab-brief" lay-filter="user">

99
view/taoler/index/public/header.html
View File

@ -1,65 +1,70 @@
<div class="fly-header layui-bg-black">
<div class="layui-container">
<a class="fly-logo layui-hide-xs" href="/"><img src="{$sysInfo.logo}" alt="layui" width="135" height="37"></a>
<!--头部伸缩侧边栏-->
<div class="site-tree-mobile-top layui-hide">
<i class="layui-icon layui-icon-spread-left"></i>
</div>
<div class="site-mobile-shade-top"></div>
<a class="fly-logo layui-hide-md" href="/" style="padding-left:35%;"><img src="{$sysInfo.logo}" alt="layui" width="135" height="37"></a>
<ul class="layui-nav fly-nav layui-hide-xs">
{volist name="headlinks" id="vo"}
<li class="layui-nav-item">
<a href="{$vo.slid_href}"><i class="layui-icon {$vo.slid_img}"></i>{$vo.slid_name}</a>
</li>
<li class="layui-nav-item">
<a href="{$vo.slid_href}"><i class="layui-icon {$vo.slid_img}"></i>{$vo.slid_name}</a>
</li>
{/volist}
</ul>
<ul class="layui-nav fly-nav-user">
{if session('?user_id')}
{if($Request.action=='user')}
<li class="layui-nav-item">
<a href="/">{:lang('home page')}</a>
</li>
<li class="layui-nav-item">
<a href="/">{:lang('home page')}</a>
</li>
{/if}
<li class="layui-nav-item">
<a class="fly-nav-avatar" href="javascript:;">
<cite class="layui-hide-xs">{:session('user_name')}</cite>
<i class="iconfont icon-renzheng layui-hide-xs" title="认证信息：layui 作者"></i>
<i class="layui-badge fly-badge-vip layui-hide-xs">VIP{$user.vip}</i>
<img src="{$user.user_img}">
</a>
<dl class="layui-nav-child">
<dd><a href="{:url('user/index')}"><i class="layui-icon">&#xe612;</i>{:lang('user center')}</a></dd>
<dd><a href="{:url('user/set')}"><i class="layui-icon">&#xe620;</i>{:lang('set info')}</a></dd>
<hr>
<dd><a href="{:url('user/message')}"><i class="iconfont icon-tongzhi" style="top: 4px;"></i>{:lang('my message')}</a></dd>
<dd><a href="{:url('user/home',['id'=>session('user_id')])}"><i class="layui-icon" style="margin-left: 2px; font-size: 22px;">&#xe68e;</i>{:lang('my page')}</a></dd>
<hr style="margin: 5px 0;">
<dd><a data-url="{:url('user/logout')}" location-url="{:url('index/index')}" href="javascript:void(0)" class="logi_logout" style="text-align: center;">{:lang('logout')}</a></dd>
</dl>
</li>
<li class="layui-nav-item">
<a class="fly-nav-avatar" href="javascript:;">
<cite class="layui-hide-xs">{:session('user_name')}</cite>
<i class="iconfont icon-renzheng layui-hide-xs" title="认证信息：layui 作者"></i>
<i class="layui-badge fly-badge-vip layui-hide-xs">VIP{$user.vip}</i>
<img src="{$user.user_img}">
</a>
<dl class="layui-nav-child">
<dd><a href="{:url('user/index')}"><i class="layui-icon">&#xe612;</i>{:lang('user center')}</a></dd>
<dd><a href="{:url('user/set')}"><i class="layui-icon">&#xe620;</i>{:lang('set info')}</a></dd>
<hr>
<dd><a href="{:url('user/message')}"><i class="iconfont icon-tongzhi" style="top: 4px;"></i>{:lang('my message')}</a></dd>
<dd><a href="{:url('user/home',['id'=>session('user_id')])}"><i class="layui-icon" style="margin-left: 2px; font-size: 22px;">&#xe68e;</i>{:lang('my page')}</a></dd>
<hr style="margin: 5px 0;">
<dd><a data-url="{:url('user/logout')}" location-url="{:url('index/index')}" href="javascript:void(0)" class="logi_logout" style="text-align: center;">{:lang('logout')}</a></dd>
</dl>
</li>
{else /}
<!-- 未登入的状态 -->
<li class="layui-nav-item">
<a class="iconfont icon-touxiang" href="{:url('login/index')}"></a>
</li>
<li class="layui-nav-item layui-hide-xs">
<a href="{:url('login/index')}">{:lang('login')}</a>
</li>
<li class="layui-nav-item layui-hide-xs">
<a href="{:url('login/reg')}">{:lang('register')}</a>
</li>
<li class="layui-nav-item layui-hide-xs" >
<select name="language" style="width:50px;" lay-filter="language" lay-verify="" id="language1">
<option value="cn" {if cookie('think_lang')=='zh-cn'} selected{/if} >简体</option>
<option value="tw" {if cookie('think_lang')=='zh-tw'} selected{/if} >繁体</option>
<option value="en" {if cookie('think_lang')=='en-us'} selected{/if} >English</option>
</select>
</li>
<!--li class="layui-nav-item layui-hide-xs">
<a href="" onclick="layer.msg('正在通过QQ登入', {icon:16, shade: 0.1, time:0})" title="QQ登入" class="iconfont icon-qq"></a>
</li>
<li class="layui-nav-item layui-hide-xs">
<a href="" onclick="layer.msg('正在通过微博登入', {icon:16, shade: 0.1, time:0})" title="微博登入" class="iconfont icon-weibo"></a>
</li-->
<li class="layui-nav-item">
<a class="iconfont icon-touxiang" href="{:url('login/index')}"></a>
</li>
<li class="layui-nav-item layui-hide-xs">
<a href="{:url('login/index')}">{:lang('login')}</a>
</li>
<li class="layui-nav-item layui-hide-xs">
<a href="{:url('login/reg')}">{:lang('register')}</a>
</li>
<li class="layui-nav-item layui-hide-xs" >
<select name="language" style="width:50px;" lay-filter="language" lay-verify="" id="language">
<option value="cn" {if cookie('think_lang')=='zh-cn'} selected{/if} >简体</option>
<option value="tw" {if cookie('think_lang')=='zh-tw'} selected{/if} >繁体</option>
<option value="en" {if cookie('think_lang')=='en-us'} selected{/if} >English</option>
</select>
</li>
<!--li class="layui-nav-item layui-hide-xs">
<a href="" onclick="layer.msg('正在通过QQ登入', {icon:16, shade: 0.1, time:0})" title="QQ登入" class="iconfont icon-qq"></a>
</li>
<li class="layui-nav-item layui-hide-xs">
<a href="" onclick="layer.msg('正在通过微博登入', {icon:16, shade: 0.1, time:0})" title="微博登入" class="iconfont icon-weibo"></a>
</li-->
{/if}
</ul>

14
view/taoler/index/public/menu.html
View File

@ -1,11 +1,11 @@
<div class="layui-hide-md">
<div class="layui-panel site-menu" style="width: auto;">
<div class="layui-panel site-menu" style="width: auto;">
<ul class="layui-menu layui-menu-lg">
<li class="search" style="padding-left:5px;padding-top:2px;">
<input type="search" value="" aria-label="Search text" placeholder="搜索" class="layui-input">
<form action="{:url('index/search',['keywords'=>$Request.param.keywords])}">
<input type="search" name="keywords" value="" aria-label="Search text" placeholder="搜索" class="layui-input">
</form>
</li>
{if session('?user_id')}
<li class="layui-nav-item">
@ -20,7 +20,7 @@
<a href="{:url('login/reg')}">{:lang('register')}</a>
</li>
<li class="layui-nav-item" >
<select name="language" style="width:50px;" lay-filter="language" lay-verify="" id="language">
<select name="language" style="width:50px;" lay-filter="language1" lay-verify="" id="language1">
<option value="cn" {if cookie('think_lang')=='zh-cn'} selected{/if} >简体</option>
<option value="tw" {if cookie('think_lang')=='zh-tw'} selected{/if} >繁体</option>
<option value="en" {if cookie('think_lang')=='en-us'} selected{/if} >English</option>
@ -82,12 +82,12 @@
</ul>
</div>
</div>
<!--
<div class="site-tree-mobile layui-hide">
<i class="layui-icon layui-icon-spread-left"></i>
</div>
<div class="site-mobile-shade"></div>
-->

3
view/taoler/index/user/home.html
View File

@ -5,6 +5,9 @@
{block name="link"}<link rel="stylesheet" href="/static/res/css/plyr.css" charset="utf-8">{/block}
{block name="column"}{/block}
{block name="content"}
<div class="">
{include file="public/menu" /}
</div>
<div class="fly-home fly-panel" style="background-image: url();">
<img src="{$u.user_img}" alt="{$u.name}">
<i class="iconfont icon-renzheng" title="Fly社区认证"></i>