diff --git a/README.md b/README.md index 48e65b9..e6c79d2 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,8 @@ 2. github https://www.github.com/taoser/TaoLer 3. composer create-project taoser/taoler +![alt taoler官网](https://www.aieok.com/storage/1/article_pic/20220802/3cf60f90f7d75b7ddb7efedd96b9e62c.png "TaoLerCMS") + #### 介绍 1. 采用动态密码加密,相同密码在入库时具有唯一性,即使管理员也无法破解,用户信息安全牢固。 @@ -24,6 +26,7 @@ 8. 项目会长期维护,优化更新。 9. 预增加插件管理机制1.0(2.0版本正式上线) +![alt taoler官网](https://www.aieok.com/storage/1/article_pic/20220802/6ea6bb3e40d9a3bc7c9ec28f3e0d7b90.png "TaoLerCMS") #### 构架组成 - 1.x版本构架: @@ -38,6 +41,8 @@ 极简、丰盈,简单高效,模块化UI框架,体积轻盈,组件丰盈。 Fly模板: 一款至简的社区模板。 + +![alt taoler官网](https://www.aieok.com/storage/1/article_pic/20220802/54c8364fffd9ca1d15856efd90b689bc.png "TaoLerCMS") #### 安装教程 diff --git a/app/admin/controller/Seo.php b/app/admin/controller/Seo.php index 88064f7..05b8043 100644 --- a/app/admin/controller/Seo.php +++ b/app/admin/controller/Seo.php @@ -2,7 +2,7 @@ /* * @Author: TaoLer * @Date: 2022-04-13 09:54:31 - * @LastEditTime: 2022-04-29 17:24:47 + * @LastEditTime: 2022-05-02 11:54:00 * @LastEditors: TaoLer * @Description: 搜索引擎SEO优化设置 * @FilePath: \TaoLer\app\admin\controller\Seo.php @@ -317,6 +317,8 @@ class Seo extends AdminController { $time = input('search_time'); $name = input('spider_name'); + $page = input('page') ? input('page') : 1; + $limit = input('limit') ? input('limit') : 20; $logPath = app()->getRootPath().'runtime/log/browse/'.$time.'.log'; $logPath = str_replace('\\','/',$logPath); if(!file_exists($logPath)) { @@ -324,6 +326,7 @@ class Seo extends AdminController } $log = file_get_contents($logPath); $log = preg_replace('/\[info\][^\n]*compatible;/', '', $log); + $log = preg_replace('/\[info\][^\n]*(?=YisouSpider)/', ' ', $log); switch($name) { case 'Baiduspider': @@ -340,7 +343,7 @@ class Seo extends AdminController break; default: // 正则全部蜘蛛 - preg_match_all('/(.*?)(?:bingbot|Googlebot|Baiduspider|Bytespider|SemrushBot|AhrefsBot|MJ12bot)+[^\n]*\r?\n/',$log,$arr); + preg_match_all('/(.*?)(?:bingbot|Googlebot|Baiduspider|Bytespider|360Spider|YisouSpider|Sosospider|Sogou News Spider|SemrushBot|AhrefsBot|MJ12bot)+[^\n]*\r?\n/',$log,$arr); } // $string = ''; @@ -355,6 +358,7 @@ class Seo extends AdminController // } else { // return json(['code'=>-1,'msg'=>'还没有蜘蛛来哦']); // } + $data = []; $list = []; if(count($arr[0])) { $list['code']= 0; @@ -363,22 +367,35 @@ class Seo extends AdminController foreach($arr[0] as $k =>$str) { // $str = preg_replace('/\[(.*?)T/', '', $str); // $str = preg_replace('/\+08:00\]/', '', $str); - // 时间 $str = preg_replace('/\/(.*?)\)/', '', $str); + // 时间 $ptime = "/([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/"; preg_match($ptime, $str,$at); $time = str_replace('T',' ',$at[0]); //$list[$k]['time'] = $time; // ip - $pip = '/(?:(?:2[0-4][0-9]\.)|(?:25[0-5]\.)|(?:1[0-9][0-9]\.)|(?:[1-9][0-9]\.)|(?:[0-9]\.)){3}(?:(?:2[0-5][0-5])|(?:25[0-5])|(?:1[0-9][0-9])|(?:[1-9][0-9])|(?:[1-9]))/'; + $pip = '/((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/'; preg_match($pip, $str,$aip); $ip = $aip[0]; // url $pattern="/(http|https):\/\/.*$/i"; preg_match($pattern, $str,$url); + // name + preg_match('/(?:bingbot|Googlebot|Baiduspider|Bytespider|360Spider|YisouSpider|Sosospider|Sogou News Spider|SemrushBot|AhrefsBot|MJ12bot)/', $str, $n); + $name = $n[0]; - $list['data'][] = ['id'=>$k + 1, 'time'=>$time, 'name'=>$name, 'ip'=>$ip, 'url'=>$url[0]]; + //$list['data'][] = ['id'=>$k + 1, 'time'=>$time, 'name'=>$name, 'ip'=>$ip, 'url'=>$url[0]]; + $data[] = ['id'=>$k + 1, 'time'=>$time, 'name'=>$name, 'ip'=>$ip, 'url'=>$url[0]]; } + $datas = array_chunk($data,(int)$limit); + //$pages = count($datas); + + foreach($datas as $k=>$v) { + if($page-1 == $k) { + $list['data'] = $v; + } + } + return json($list); } else { return json(['code'=>-1,'msg'=> '没有需要分析的数据']); diff --git a/app/admin/controller/Slider.php b/app/admin/controller/Slider.php index d1b8a77..fc0ff26 100644 --- a/app/admin/controller/Slider.php +++ b/app/admin/controller/Slider.php @@ -5,8 +5,6 @@ use app\common\controller\AdminController; use think\facade\View; use think\facade\Db; use think\facade\Request; -use think\facade\Config; -use think\exception\ValidateException; use app\common\model\Slider as SliderModel; class Slider extends AdminController @@ -19,10 +17,51 @@ class Slider extends AdminController */ public function index() { - //幻灯列表 - $sliders = SliderModel::select(); - View::assign('slider',$sliders); - return View::fetch(); + return View::fetch(); + } + + /** + * 链接列表 + * + * @return void + */ + public function list() + { + $list = []; + $type = input('slid_type'); + $limit = input('limit'); + $page = input('page'); + if($type) { + $datas = SliderModel::where('slid_type',$type)->where('')->paginate([ + 'list_rows'=> $limit, + 'page'=>$page + ]); + } else { + $datas = SliderModel::paginate([ + 'list_rows'=> $limit, + 'page'=>$page + ]); + } + + if(count($datas)) { + $list = ['code'=>0,'msg'=>'获取数据成功']; + foreach($datas as $k=>$v) { + $list['data'][] = [ + 'id'=>$v['id'], + 'slid_name'=>$v['slid_name'], + 'slid_img' =>$v['slid_img'], + 'slid_type'=>$v['slid_type'], + 'slid_href'=>$v['slid_href'], + 'slid_color'=>$v['slid_color'], + 'slid_start'=> time() < $v['slid_start'] ? '未开始' : date('Y-m-d H:i',$v['slid_start']), + 'slid_over'=> time() > $v['slid_over'] ? '已结束' : date('Y-m-d H:i',$v['slid_over']), + 'slid_status'=> $v['slid_status'] ? '正常' : '禁止' + ]; + } + return json($list); + } else { + return json(['code'=>-1,'msg'=>'还没有数据']); + } } /** @@ -37,13 +76,14 @@ class Slider extends AdminController $data = Request::param(); $data['slid_start'] = strtotime($data['slid_start']); $data['slid_over'] = strtotime($data['slid_over']); - $result = Db::name('slider')->save($data); - if($result){ + $slid = new SliderModel(); + $result = $slid->add($data); + if($result == 1){ $res = ['code'=>0,'msg'=>'添加成功']; }else{ $res = ['code'=>-1,'msg'=>'添加失败']; } - return json($res); + return json($res); } return View::fetch(); @@ -57,22 +97,23 @@ class Slider extends AdminController * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function edit($id) + public function edit() { - $slider = Db::name('slider')->find($id); + $id = (int)input('id'); + $slider = Db::name('slider')->find($id); - if(Request::isAjax()){ - $data = Request::param(); - //var_dump($data); - $data['slid_start'] = strtotime($data['slid_start']); - $data['slid_over'] = strtotime($data['slid_over']); - $result = Db::name('slider')->where('id',$id)->save($data); - if($result){ - $res = ['code'=>0,'msg'=>'编辑成功']; - }else{ - $res = ['code'=>-1,'msg'=>'编辑失败']; - } - return json($res); + if(Request::isAjax()){ + $data = Request::param(); + $data['slid_start'] = strtotime($data['slid_start']); + $data['slid_over'] = strtotime($data['slid_over']); + $slid = new SliderModel(); + $result = $slid->edit($data); + if($result == 1){ + $res = ['code'=>0,'msg'=>'编辑成功']; + }else{ + $res = ['code'=>-1,'msg'=>'编辑失败']; + } + return json($res); } View::assign('slider',$slider); @@ -84,11 +125,11 @@ class Slider extends AdminController */ public function uploadImg() { - $uploads = new \app\common\lib\Uploads(); - $upRes = $uploads->put('file','slider',1024,'image'); - $slires = $upRes->getData(); + $uploads = new \app\common\lib\Uploads(); + $upRes = $uploads->put('file','slider',1024,'image'); + $slires = $upRes->getData(); - if($slires['status'] == 0){ + if($slires['status'] == 0){ $name_path = $slires['url']; $res = ['code'=>0,'msg'=>'上传flash成功','src'=>$name_path]; } else { @@ -106,13 +147,12 @@ class Slider extends AdminController */ public function delete($id) { - // - $slider = SliderModel::find($id); - $res = $slider->delete(); - if($res){ - return json(['code'=>0,'msg'=>'删除成功']); - } else { - return json(['code'=>-1,'msg'=>'删除失败']); - } + $slider = SliderModel::find($id); + $res = $slider->delete(); + if($res){ + return json(['code'=>0,'msg'=>'删除成功']); + } else { + return json(['code'=>-1,'msg'=>'删除失败']); + } } } diff --git a/app/admin/view/seo/index.html b/app/admin/view/seo/index.html index f747afa..5742a5b 100644 --- a/app/admin/view/seo/index.html +++ b/app/admin/view/seo/index.html @@ -194,7 +194,7 @@ - + @@ -257,8 +257,9 @@ ,{field: 'time', title: '时间', width:160} ,{field: 'name', title: '名称', width:120, sort: true} ,{field: 'ip', title: 'IP', width:200} - ,{field: 'url', title: 'URL', minWidth: 200} + ,{field: 'url', title: 'URL', minWidth: 200, templet: '
{{d.url}}
'} ]] + ,limit: 20 ,text: '对不起,加载出现异常!' }); @@ -366,6 +367,9 @@ //执行重载 table.reload('spider', { where: field + ,page: { + curr: 1 //重新从第 1 页开始 + } }); }); return false; diff --git a/app/admin/view/slider/add.html b/app/admin/view/slider/add.html index ec76771..477dfc8 100644 --- a/app/admin/view/slider/add.html +++ b/app/admin/view/slider/add.html @@ -4,23 +4,23 @@
-
+
+ + +
diff --git a/app/admin/view/slider/edit.html b/app/admin/view/slider/edit.html index b317c36..b449e31 100644 --- a/app/admin/view/slider/edit.html +++ b/app/admin/view/slider/edit.html @@ -7,18 +7,18 @@
+
@@ -34,12 +34,12 @@
-
- -
- -
-
+
+ +
+ +
+
@@ -118,20 +118,13 @@ imgcom.uploads(obj); } ,done: function(res){ - $(this.item).prev("div").children("input").val(res.src) - if(res.code == 0){ - layer.msg(res.msg,{ - icon:6, - tiye:2000 - }); - } else { - layer.open({ - title:"上传失败", - content:res.msg, - icon:5, - anim:6 - }); - } + $(this.item).prev("div").children("input").val(res.src) + if(res.code == 0){ + layer.msg(res.msg,{icon:6,tiye:2000}); + } else { + layer.open({title:"上传失败",content:res.msg,icon:5,anim:6 + }); + } } }); }) diff --git a/app/admin/view/slider/index.html b/app/admin/view/slider/index.html index 0d979c2..4056b2e 100644 --- a/app/admin/view/slider/index.html +++ b/app/admin/view/slider/index.html @@ -8,52 +8,35 @@
-
- -
- - - - - - - - - - - - - - - - - {volist name="slider" id="vo"} - - - - - - - - - - - - - {/volist} - -
ID名称图片/icon位置路径颜色开始结束状态操作
{$vo.id}{$vo.slid_name}{notempty name="$vo.slid_img"}{if $vo.slid_type == '头部菜单'}
{else /}{/if}{/notempty}
{$vo.slid_type}{$vo.slid_href}{$vo.slid_color}{$vo.slid_start|date='Y-m-d'}{$vo.slid_over|date='Y-m-d'}{$vo.slid_status ?'显示':'禁止'} - - {if condition="checkRuleButton('Slider/delete')"} - - {else /}{/if} -
-
- + +
位置: +
+ +
+
+
+ +
- -
@@ -69,11 +52,108 @@ base: '/static/admin/' //静态资源所在路径 }).extend({ index: 'lib/index' //主入口模块 - }).use(['index','layer','table','form'], function(){ + }).use(['index','layer','table','util','form'], function(){ var $ = layui.jquery ,layer = layui.layer ,table = layui.table ,form = layui.form; + var util = layui.util; + + //第一个实例 + table.render({ + elem: '#slider' + ,url: "{:url('slider/list')}" //数据接口 + ,page: true //开启分页 + ,cols: [[ //表头 + {field: 'id', title: 'ID', width:80, sort: true, fixed: 'left'} + ,{field: 'slid_type', title: '位置', width:120} + ,{field: 'slid_img', title: '图片/icon', width:150, templet: '#imgTpl'} + ,{field: 'slid_name', title: '名称', width:180} + ,{field: 'slid_href', title: 'URL', minWidth: 250} + ,{field: 'slid_color', title: '颜色', width: 80} + ,{field: 'slid_start', title: '开始', width: 150, sort: true} + ,{field: 'slid_over', title: '结束', width: 150, sort: true} + ,{field: 'slid_status', title: '状态', width: 135} + ,{fixed: 'right', title:'操作', toolbar: '#barDemo', width:150} + ]] + ,limit: 15 + ,text: '对不起,加载出现异常!' + }); + + form.on('select(slid-type)', function(data){ + $.post("{:url('slider/list')}", {"slid_type":data.value}, function (data){ + if (data.code == -1){ + layer.open({content:data.msg,icon:5,anim:6}); + } + } + ); + //执行重载 + table.reload('slider', { + where: {slid_type: data.value} + ,page: { + curr: 1 //重新从第 1 页开始 + } + }); + }); + + //监听行工具事件 + table.on('tool(slider)', function(obj){ + var data = obj.data; + var id = data.id; + //console.log(obj) + if(obj.event === 'del'){ + layer.confirm('真的删除行么', {icon: 3, title:'删除链接?'}, function(index){ + //提交 Ajax 成功后,静态更新表格中的数据 + $.post("{:url('slider/delete')}", {"id":data.id}, function(data){ + if (data.code == 0) { + layer.msg(data.msg,{icon:6,time:2000}, function(){ + location.reload(); + }); + } else { + layer.open({title:'删除失败',content:data.msg,icon:5,anim:6}); + } + }); + }); + layer.close(index); + } else if(obj.event === 'edit'){ + layer.open({ + type: 2, + title: '编辑链接', + content: 'edit.html?id='+ id, + maxmin: true, + area : ['500px' , '600px'], + btn: ['确定', '取消'], + yes: function(index, layero){ + var iframeWindow = window['layui-layer-iframe'+ index] + ,submitID = 'LAY-slider-submit' + ,submit = layero.find('iframe').contents().find('#'+ submitID); + //监听提交 + iframeWindow.layui.form.on('submit('+ submitID +')', function(data){ + var field = data.field; //获取提交的字段 + //提交 Ajax 成功后,静态更新表格中的数据 + $.ajax({ + type:"post", + url:"{:url('slider/edit')}", + data:{"id":id,"slid_type":field.slid_type,"slid_name":field.slid_name,"slid_color":field.slid_color,"slid_start":field.slid_start,"slid_over":field.slid_over,"slid_href":field.slid_href,"slid_img":field.slid_img}, + daType:"json", + success:function (data){ + if (data.code == 0) { + layer.msg(data.msg,{icon:6,time:2000}, function(){ + location.reload(); + }); + } else { + layer.open({title:'添加失败',content:data.msg,icon:5,anim:6}); + } + } + }); + layer.close(index); + }); + submit.trigger('click'); + } + }); + } + }); + //添加幻灯 $('#slid-add').on('click', function(){ layer.open({ @@ -81,7 +161,7 @@ title: '添加链接', content: 'add.html', maxmin: true, - area : ['460px' , '530px'], + area : ['500px' , '600px'], btn: ['确定', '取消'], yes: function(index, layero){ var iframeWindow = window['layui-layer-iframe'+ index] @@ -122,88 +202,6 @@ } }); }); - //编辑广告 - $('a[lay-event=edit]').on('click', function(){ - var id = $(this).attr('id-data'); - layer.open({ - type: 2, - title: '编辑链接', - content: 'edit.html?id='+ id, - maxmin: true, - area : ['460px' , '530px'], - btn: ['确定', '取消'], - yes: function(index, layero){ - var iframeWindow = window['layui-layer-iframe'+ index] - ,submitID = 'LAY-slider-submit' - ,submit = layero.find('iframe').contents().find('#'+ submitID); - - //监听提交 - iframeWindow.layui.form.on('submit('+ submitID +')', function(data){ - var field = data.field; //获取提交的字段 - //console.log(field); - - //提交 Ajax 成功后,静态更新表格中的数据 - $.ajax({ - type:"post", - url:"{:url('slider/edit')}", - data:{"id":id,"slid_type":field.slid_type,"slid_name":field.slid_name,"slid_color":field.slid_color,"slid_start":field.slid_start,"slid_over":field.slid_over,"slid_href":field.slid_href,"slid_img":field.slid_img}, - daType:"json", - success:function (data){ - if (data.code == 0) { - layer.msg(data.msg,{ - icon:6, - time:2000 - }, function(){ - location.reload(); - }); - } else { - layer.open({ - title:'添加失败', - content:data.msg, - icon:5, - anim:6 - }); - } - } - }); - layer.close(index); - }); - submit.trigger('click'); - } - }); - }); - - //删除幻灯 - $('a[lay-event=del]').on('click', function(){ - var id = $(this).attr('id-data'); - layer.confirm('确定删除?', {icon: 3, title:'删除幻灯'}, function(index){ - //提交 Ajax 成功后,静态更新表格中的数据 - $.ajax({ - type:"post", - url:"{:url('slider/delete')}", - data:{"id":id}, - daType:"json", - success:function (data){ - if (data.code == 0) { - layer.msg(data.msg,{ - icon:6, - time:2000 - }, function(){ - location.reload(); - }); - } else { - layer.open({ - title:'删除失败', - content:data.msg, - icon:5, - anim:6 - }); - } - } - }); - layer.close(index); - }); - }); }); diff --git a/app/common/model/Slider.php b/app/common/model/Slider.php index 9fb1132..84375d2 100644 --- a/app/common/model/Slider.php +++ b/app/common/model/Slider.php @@ -1,4 +1,13 @@ + * @Date: 2021-12-06 16:04:50 + * @LastEditTime: 2022-05-01 17:10:55 + * @LastEditors: TaoLer + * @Description: 链接投放优化设置 + * @FilePath: \TaoLer\app\common\model\Slider.php + * Copyright (c) 2020~2022 http://www.aieok.com All rights reserved. + */ namespace app\common\model; use think\Model; @@ -35,7 +44,7 @@ class Slider extends Model $sliders = Cache::get('slider'.$type); if(!$sliders){ $sliders = $this::where(['slid_status'=>1,'delete_time'=>0,'slid_type'=>$type])->whereTime('slid_over','>=',time())->select()->toArray(); - Cache::set('slider'.$type,$sliders,3600); + Cache::tag('tagSlider')->set('slider'.$type,$sliders,3600); } return $sliders; } @@ -46,6 +55,7 @@ class Slider extends Model $result = $this::save($data); if($result) { + Cache::tag('tagSlider')->clear(); return 1; } else { return 'add_error'; @@ -58,6 +68,7 @@ class Slider extends Model $slider = $this::find($data['id']); $result = $slider->save($data); if($result) { + Cache::tag('tagSlider')->clear(); return 1; } else { return 'edit_error'; diff --git a/app/index/controller/User.php b/app/index/controller/User.php index 15f8721..f5fd2dd 100644 --- a/app/index/controller/User.php +++ b/app/index/controller/User.php @@ -32,7 +32,7 @@ class User extends BaseController //发帖list public function artList() { - $article = Article::withCount('comments')->where('user_id',$this->uid)->order('update_time','desc')->paginate(10); + $article = Article::withCount('comments')->where(['user_id'=>$this->uid])->order('update_time','desc')->paginate(10); //var_dump($article); $count = $article->total(); $res = []; @@ -198,9 +198,9 @@ class User extends BaseController //用户发贴 - $arts = Db::name('user')->alias('u')->join('article a','u.id = a.user_id')->field('u.id,a.id,a.title,a.pv,a.is_hot,a.create_time,a.delete_time')->where('a.delete_time',0)->where('a.user_id',$id)->order(['a.create_time'=>'desc'])->cache(3600)->select(); + $arts = Db::name('user')->alias('u')->join('article a','u.id = a.user_id')->field('u.id,a.id,a.title,a.pv,a.is_hot,a.create_time,a.delete_time,a.status')->where(['a.delete_time'=>0,'a.status'=>1])->where('a.user_id',$id)->order(['a.create_time'=>'desc'])->cache(3600)->select(); //用户回答 - $reys = Db::name('comment')->alias('c')->join('article a','c.article_id = a.id')->field('a.id,a.title,c.content,c.create_time,c.delete_time')->where(['a.delete_time'=>0,'c.delete_time'=>0])->where('c.user_id',$id)->order(['c.create_time'=>'desc'])->cache(3600)->select(); + $reys = Db::name('comment')->alias('c')->join('article a','c.article_id = a.id')->field('a.id,a.title,c.content,c.create_time,c.delete_time,c.status')->where(['a.delete_time'=>0,'c.delete_time'=>0,'c.status'=>1])->where('c.user_id',$id)->order(['c.create_time'=>'desc'])->cache(3600)->select(); View::assign(['u'=>$u,'arts'=>$arts,'reys'=>$reys,'jspage'=>'']); return View::fetch(); diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index cfe1ee8..5935b46 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => 'bb712c71c521dd5acc4656bb49ff90285de07458', + 'reference' => '334c91212372abf2e9a2441668700e9a794b635d', 'name' => 'taoser/taoler', 'dev' => true, ), @@ -160,7 +160,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => 'bb712c71c521dd5acc4656bb49ff90285de07458', + 'reference' => '334c91212372abf2e9a2441668700e9a794b635d', 'dev_requirement' => false, ), 'taoser/think-addons' => array( diff --git a/vendor/services.php b/vendor/services.php index 189c070..998d534 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'taoser\\addons\\Service', diff --git a/view/taoler/index/article/news/cate.html b/view/taoler/index/article/news/cate.html index 7a6e508..e1a13a9 100644 --- a/view/taoler/index/article/news/cate.html +++ b/view/taoler/index/article/news/cate.html @@ -12,37 +12,38 @@ -
+
@@ -56,21 +57,21 @@
{:lang('hot post list')}
{volist name="artHot" id="vo"} -
+
{$vo.title} {$vo.comments_count}
- {/volist} -
+ {/volist} +
- {volist name="ad_comm" id="vo"} - {$vo.slid_name} - {/volist} + {volist name="ad_comm" id="vo"} + {$vo.slid_name} + {/volist}
diff --git a/view/taoler/index/article/news/detail.html b/view/taoler/index/article/news/detail.html index 9211d49..055d692 100644 --- a/view/taoler/index/article/news/detail.html +++ b/view/taoler/index/article/news/detail.html @@ -25,9 +25,10 @@
{$article.content}
-
- {//管理} + + {//管理} {if (($article.upzip !== '') || session('?user_name'))} +
{notempty name="$article.upzip"} @@ -40,7 +41,6 @@ {else /} {:lang('cancel topping')} {/if} - {if($article.is_hot == 0)} {else /} @@ -58,8 +58,9 @@ {/if}
- {/if}
+ {/if} + diff --git a/view/taoler/index/article/posts/detail.html b/view/taoler/index/article/posts/detail.html index 7e0be6f..023c60a 100644 --- a/view/taoler/index/article/posts/detail.html +++ b/view/taoler/index/article/posts/detail.html @@ -46,9 +46,9 @@
{$article.content}
+ {//管理} + {if (($article.upzip !== '') || session('?user_name'))}
- {//管理} - {if (($article.upzip !== '') || session('?user_name'))}
{notempty name="$article.upzip"} @@ -78,8 +78,9 @@ {/if}
- {/if} + {/if} + {//评论}