diff --git a/app/admin/controller/Forum.php b/app/admin/controller/Forum.php index 06a2129..2a46a13 100644 --- a/app/admin/controller/Forum.php +++ b/app/admin/controller/Forum.php @@ -150,7 +150,7 @@ class Forum extends AdminController $res['count']= count($list); $res['data'] = []; foreach($list as $k=>$v){ - $res['data'][] = ['sort'=>$v['sort'],'id' => $v['id'],'tags'=>$v['catename'],'ename'=>$v['ename'],'is_hot'=>$v['is_hot'],'desc'=>$v['desc']]; + $res['data'][] = ['sort'=>$v['sort'],'id' => $v['id'],'tags'=>$v['catename'],'ename'=>$v['ename'],'icon'=>$v['icon'],'is_hot'=>$v['is_hot'],'desc'=>$v['desc']]; } } return json($res); diff --git a/app/admin/view/forum/tags.html b/app/admin/view/forum/tags.html index f8147e4..d690c3b 100644 --- a/app/admin/view/forum/tags.html +++ b/app/admin/view/forum/tags.html @@ -16,11 +16,11 @@ @@ -53,13 +53,14 @@ type: 2 ,title: '添加分类' ,content: 'tagsform.html' - ,area: ['400px', '350px'] + ,area: ['400px', '450px'] ,btn: ['确定', '取消'] ,yes: function(index, layero){ var othis = layero.find('iframe').contents().find("#layuiadmin-app-form-tags") ,sort = othis.find('input[name="sort"]').val() ,tags = othis.find('input[name="tags"]').val() ,ename = othis.find('input[name="ename"]').val() + ,icon = othis.find('input[name="icon"]').val() ,desc = othis.find('input[name="desc"]').val(); if(!tags.replace(/\s/g, '')) return; @@ -67,7 +68,7 @@ $.ajax({ type:"post", url:"{:url('admin/Forum/addtags')}", - data:{"sort":sort,"catename":tags,"ename":ename,"desc":desc}, + data:{"sort":sort,"catename":tags,"ename":ename,"icon":cion,"desc":desc}, daType:"json", success:function (data){ if (data.code == 0) { diff --git a/app/admin/view/forum/tagsform.html b/app/admin/view/forum/tagsform.html index f3bf31a..19ec1f3 100644 --- a/app/admin/view/forum/tagsform.html +++ b/app/admin/view/forum/tagsform.html @@ -11,6 +11,10 @@
+
+ +
+
@@ -31,9 +35,22 @@ base: '/static/admin/' //静态资源所在路径 }).extend({ index: 'lib/index' //主入口模块 - }).use(['index', 'form'], function(){ + }).use(['index', 'form', 'iconPicker'], function(){ var $ = layui.$ ,form = layui.form ; + var iconPicker = layui.iconPicker; + + //初始化图标选择 + iconPicker.render({ + elem: '#iconPicker', + type: 'fontClass', + search: false, + page: true, + limit: 12, + click: function (data) { + //console.log(data); + } + }); }) {/block} \ No newline at end of file diff --git a/app/index/lang/zh-cn.php b/app/index/lang/zh-cn.php index 001f66b..89a56bb 100644 --- a/app/index/lang/zh-cn.php +++ b/app/index/lang/zh-cn.php @@ -4,7 +4,8 @@ return [ //语言 'language' => 'language', 'chinese' => '中文简体', - 'english' => 'english', + 'tChinese' => '中文繁体', + 'english' => 'English', //弹窗提示消息 'add' => '添加', diff --git a/app/index/lang/zh-tw.php b/app/index/lang/zh-tw.php index 47ff9cf..9bbf2a0 100644 --- a/app/index/lang/zh-tw.php +++ b/app/index/lang/zh-tw.php @@ -4,6 +4,7 @@ return [ //語言 'language' => 'language', 'chinese' => '中文簡體', + 'tChinese' => '中文繁體', 'english' => 'english', //彈窗提示消息 diff --git a/app/install/data/taoler.sql b/app/install/data/taoler.sql index 0ce7ed8..242fb78 100644 --- a/app/install/data/taoler.sql +++ b/app/install/data/taoler.sql @@ -270,6 +270,7 @@ CREATE TABLE `tao_cate` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id', `catename` varchar(20) NOT NULL COMMENT '导航名称', `ename` varchar(20) NOT NULL DEFAULT '' COMMENT '分类别名', + `icon` varchar(50) DEFAULT NULL COMMENT '图标', `sort` int(11) NOT NULL DEFAULT '0' COMMENT '排序', `status` enum('0','1') NOT NULL DEFAULT '1' COMMENT '状态1启用0禁用', `type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0帖子1文章', @@ -285,9 +286,9 @@ CREATE TABLE `tao_cate` ( -- ---------------------------- -- Records of tao_cate -- ---------------------------- -INSERT INTO `tao_cate` VALUES ('1', '提问', 'ask', '1', '1', '0', 'TaoLer社区提问专栏1', '0', '0', '0', '0'); -INSERT INTO `tao_cate` VALUES ('2', '分享', 'share', '2', '1', '0', '', '0', '0', '0', '0'); -INSERT INTO `tao_cate` VALUES ('3', '讨论', 'talk', '3', '1', '0', '', '1', '0', '0', '0'); +INSERT INTO `tao_cate` VALUES ('1', '提问', 'ask', 'layui-icon-help', '1', '1', '0', 'TaoLer社区提问专栏1', '0', '0', '0', '0'); +INSERT INTO `tao_cate` VALUES ('2', '分享', 'share', 'layui-icon-share', '2', '1', '0', '', '0', '0', '0', '0'); +INSERT INTO `tao_cate` VALUES ('3', '讨论', 'talk', 'layui-icon-dialogue', '3', '1', '0', '', '1', '0', '0', '0'); -- ---------------------------- -- Table structure for tao_collection diff --git a/config/taoler.php b/config/taoler.php index 58e912c..c99da76 100644 --- a/config/taoler.php +++ b/config/taoler.php @@ -7,7 +7,7 @@ return [ //应用名,此项不可更改 'appname' => 'TaoLer', //版本配置 - 'version' => '1.7.20', + 'version' => '1.7.21', //加盐 'salt' => 'taoler', //数据库备份目录 diff --git a/public/static/admin/modules/forum.js b/public/static/admin/modules/forum.js index fb9b345..6dc7823 100644 --- a/public/static/admin/modules/forum.js +++ b/public/static/admin/modules/forum.js @@ -220,9 +220,13 @@ layui.define(['table', 'form'], function(exports){ ,{field: 'id', title: 'ID',width: 60} ,{field: 'tags', title: '分类名', minWidth: 100} ,{field: 'ename', title: 'EN别名', minWidth: 100} + ,{ + title: '图标', align: 'center', + templet: '

' + } ,{field: 'is_hot', title: '热门', templet: '#buttonHot'} ,{field: 'desc', title: '描述', minWidth: 100} - ,{title: '操作', width: 150, align: 'center', fixed: 'right', toolbar: '#layuiadmin-app-cont-tagsbar'} + ,{title: '操作', width: 100, align: 'center', toolbar: '#layuiadmin-app-cont-tagsbar'} ]] ,text: '对不起，加载出现异常！' }); @@ -264,7 +268,7 @@ layui.define(['table', 'form'], function(exports){ type: 2 ,title: '编辑分类' ,content: forumTagsForm + '?id='+ data.id - ,area: ['450px', '300px'] + ,area: ['400px', '450px'] ,btn: ['确定', '取消'] ,yes: function(index, layero){ //获取iframe元素的值 @@ -272,6 +276,7 @@ layui.define(['table', 'form'], function(exports){ ,sort = othis.find('input[name="sort"]').val() ,tags = othis.find('input[name="tags"]').val() ,ename = othis.find('input[name="ename"]').val() + ,icon = othis.find('input[name="icon"]').val() ,desc = othis.find('input[name="desc"]').val(); if(!tags.replace(/\s/g, '')) return; @@ -279,7 +284,7 @@ layui.define(['table', 'form'], function(exports){ $.ajax({ type:"post", url:forumTagsForm, - data:{"id":data.id,"sort":sort,"catename":tags,"ename":ename,"desc":desc}, + data:{"id":data.id,"sort":sort,"catename":tags,"ename":ename,"icon":icon,"desc":desc}, daType:"json", success:function (data){ if (data.code == 0) { @@ -314,6 +319,7 @@ layui.define(['table', 'form'], function(exports){ othis.find('input[name="sort"]').val(data.sort) ,othis.find('input[name="tags"]').val(data.tags) ,othis.find('input[name="ename"]').val(data.ename) + ,othis.find('input[name="icon"]').val(data.icon) ,othis.find('input[name="desc"]').val(data.desc); } }); diff --git a/public/static/res/css/global.css b/public/static/res/css/global.css index f5572c5..0060c0c 100644 --- a/public/static/res/css/global.css +++ b/public/static/res/css/global.css @@ -28,11 +28,11 @@ i{font-style: normal;} .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-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: #e2e2e2;} .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-mobile .site-mobile-shade-top{content: ''; position: fixed; top: 0; bottom: 0; left: 0; right: 0; background-color: rgba(0,0,0,.8); z-index: 999;} .site-tree-mobile-top i{font-size: 30px;} /* 底部伸缩菜单栏 */ @@ -730,7 +730,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,.8); z-index: 999;} + .site-mobile .site-mobile-shade-user{content: ''; position: fixed; top: 0; bottom: 0; left: 0; right: 0; z-index: 999;} } /*前台公用样式*/ diff --git a/view/taoler/index/public/header.html b/view/taoler/index/public/header.html index 0ae48a0..1fae36a 100644 --- a/view/taoler/index/public/header.html +++ b/view/taoler/index/public/header.html @@ -7,7 +7,7 @@
- +