From 0aec4ca54c0ed2481c2fcc52c0baa88b76f89fe3 Mon Sep 17 00:00:00 2001 From: taoser Date: Thu, 20 May 2021 11:52:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AFhtml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/controller/Article.php | 7 +- app/index/controller/Doc.php | 70 +++++++++++ app/index/controller/Index.php | 3 +- app/index/controller/Login.php | 12 +- view/taoler/index/article/add.html | 19 +-- view/taoler/index/article/cate.html | 15 +-- view/taoler/index/article/detail.html | 34 ++---- view/taoler/index/article/edit.html | 166 ++++++++++++-------------- view/taoler/index/doc/timeline.html | 17 --- view/taoler/index/index/index.html | 18 +-- view/taoler/index/index/search.html | 48 ++------ view/taoler/index/login/forget.html | 80 +++++-------- view/taoler/index/login/login.html | 63 ++++------ view/taoler/index/login/reg.html | 69 ++++------- view/taoler/index/public/base.html | 16 +++ view/taoler/index/public/column.html | 2 +- 16 files changed, 288 insertions(+), 351 deletions(-) create mode 100644 app/index/controller/Doc.php diff --git a/app/index/controller/Article.php b/app/index/controller/Article.php index e99187b..1f7dc71 100644 --- a/app/index/controller/Article.php +++ b/app/index/controller/Article.php @@ -69,7 +69,7 @@ class Article extends BaseController //通用右栏 $ad_comm = Db::name('slider')->where('slid_status',1)->where('delete_time',0)->where('slid_type',2)->whereTime('slid_over','>=',time())->select(); - View::assign(['type'=>$type,'artList'=>$artList,'artHot'=>$artHot,'ad_cate'=>$ad_cate,'ad_comm'=>$ad_comm]); + View::assign(['type'=>$type,'artList'=>$artList,'artHot'=>$artHot,'ad_cate'=>$ad_cate,'ad_comm'=>$ad_comm,'jspage'=>'jie']); return View::fetch(); } @@ -112,7 +112,7 @@ class Article extends BaseController //通用右栏 $ad_comm = Db::name('slider')->where('slid_status',1)->where('delete_time',0)->where('slid_type',2)->whereTime('slid_over','>=',time())->select(); - View::assign(['article'=>$artDetail,'pv'=>$pv,'comments'=>$comments,'artHot'=>$artHot,'ad_art'=>$ad_article,'ad_comm'=>$ad_comm,$download]); + View::assign(['article'=>$artDetail,'pv'=>$pv,'comments'=>$comments,'artHot'=>$artHot,'ad_art'=>$ad_article,'ad_comm'=>$ad_comm,$download,'jspage'=>'jie']); return View::fetch(); } @@ -178,6 +178,7 @@ class Article extends BaseController } return $res; } + View::assign(['jspage'=>'jie']); return View::fetch(); } @@ -223,7 +224,7 @@ class Article extends BaseController } } - View::assign(['article'=>$article,'tags'=>$tags]); + View::assign(['article'=>$article,'tags'=>$tags,'jspage'=>'jie']); return View::fetch(); } diff --git a/app/index/controller/Doc.php b/app/index/controller/Doc.php new file mode 100644 index 0000000..2d2b23f --- /dev/null +++ b/app/index/controller/Doc.php @@ -0,0 +1,70 @@ +where('slid_status',1)->where('delete_time',0)->where('slid_type',1)->whereTime('slid_over','>=',time())->select(); + Cache::set('slider',$sliders,3600); + } + + //更新日志 + $timeline = Db::name('time_line')->where('delete_time',0)->order('create_time','desc')->select(); + + //热议文章 + $artHot = Article::field('id,title')->withCount('comments')->where(['status'=>1,'delete_time'=>0])->whereTime('create_time', 'year')->order('comments_count','desc')->limit(10)->select(); + + //首页赞助 + $ad_index = Cache::get('adindex'); + if(!$ad_index){ + $ad_index = Db::name('slider')->where(['slid_status'=>1,'delete_time'=>0,'slid_type'=>3])->whereTime('slid_over','>=',time())->select(); + Cache::set('adindex',$ad_index,3600); + } + + //首页右栏 + $ad_comm = Cache::get('adcomm'); + if(!$ad_comm){ + $ad_comm = Db::name('slider')->where(['slid_status'=>1,'delete_time'=>0,'slid_type'=>2])->whereTime('slid_over','>=',time())->select(); + Cache::set('adcomm',$ad_comm,3600); + } + + //友情链接 + $friend_links = Cache::get('flinks'); + if(!$friend_links){ + $friend_links = Db::name('slider')->where(['slid_status'=>1,'delete_time'=>0,'slid_type'=>6])->whereTime('slid_over','>=',time())->field('slid_name,slid_href')->select(); + Cache::set('flinks',$friend_links,3600); + } + + $vs = [ + 'slider' => $sliders, + 'timeline' => $timeline, + 'artHot' => $artHot, + 'type' => $types, + 'ad_index' => $ad_index, + 'ad_comm' => $ad_comm, + 'flinks' => $friend_links, + 'jspage' => '', + ]; + View::assign($vs); + + return View::fetch(); + } + +} diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php index 264a507..953510c 100644 --- a/app/index/controller/Index.php +++ b/app/index/controller/Index.php @@ -64,6 +64,7 @@ class Index extends BaseController 'ad_index' => $ad_index, 'ad_comm' => $ad_comm, 'flinks' => $friend_links, + 'jspage' => '', ]; View::assign($vs); @@ -98,7 +99,7 @@ class Index extends BaseController $artHot = Article::getArtHot(10); View::assign($searchs); - View::assign(['flinks'=>$friend_links,'artHot'=>$artHot]); + View::assign(['flinks'=>$friend_links,'artHot'=>$artHot,'jspage'=>'']); return View::fetch('search'); } diff --git a/app/index/controller/Login.php b/app/index/controller/Login.php index 9b0867a..7a1e9b4 100644 --- a/app/index/controller/Login.php +++ b/app/index/controller/Login.php @@ -13,13 +13,19 @@ use think\facade\Cache; use think\facade\View; use app\common\model\User; - class Login extends BaseController { - //已登陆检测 + //已登陆中间件检测 protected $middleware = [ 'logedcheck' => ['except' => ['index'] ] ]; + + //给模板中JScace文件赋值 + protected function initialize() + { + parent::initialize(); + View::assign(['jspage'=>'user']); + } //用户登陆 public function index() @@ -75,6 +81,7 @@ class Login extends BaseController return Msgres::error($res); } } + return View::fetch('login'); } @@ -103,7 +110,6 @@ class Login extends BaseController } return json($res); } - //加载注册模板 return View::fetch(); } diff --git a/view/taoler/index/article/add.html b/view/taoler/index/article/add.html index 6d5c845..0762dcc 100644 --- a/view/taoler/index/article/add.html +++ b/view/taoler/index/article/add.html @@ -1,4 +1,5 @@ {extend name="public/base" /} + {block name="title"}发表帖子{/block} {block name="column"}{/block} {block name="content"} @@ -141,20 +142,7 @@ }); -{/block} -{block name="cachepage"}jie{/block} \ No newline at end of file +{/block} \ No newline at end of file diff --git a/view/taoler/index/article/cate.html b/view/taoler/index/article/cate.html index 9d53233..f0e3146 100644 --- a/view/taoler/index/article/cate.html +++ b/view/taoler/index/article/cate.html @@ -97,20 +97,7 @@ {/block} {block name="script"} - - {/block} \ No newline at end of file diff --git a/view/taoler/index/index/index.html b/view/taoler/index/index/index.html index 1885dd1..d991cf4 100644 --- a/view/taoler/index/index/index.html +++ b/view/taoler/index/index/index.html @@ -101,6 +101,7 @@ {block name="script"} - {/block} \ No newline at end of file diff --git a/view/taoler/index/index/search.html b/view/taoler/index/index/search.html index 3f602b1..828aa56 100644 --- a/view/taoler/index/index/search.html +++ b/view/taoler/index/index/search.html @@ -1,9 +1,7 @@ {extend name="public/base" /} -{block name="title"} -TP5学习制作：Tao.2019 -{/block} +{block name="title"}{$sysInfo.webname}{$keywords}搜索内容{/block} {block name="column"} {include file="/public/column" /} @@ -14,21 +12,16 @@ TP5学习制作：Tao.2019
-
-
“{$keywords}” 共{$counts}条结果
- - -
+
@@ -67,15 +59,15 @@ TP5学习制作：Tao.2019 {include file="public/index-static" /}
-
-
本周热议
- {volist name="artHot" id="vo" empty="还没有帖子"} -
- {$vo.title} - {$vo.comments_count} -
- {/volist} -
+
+
本周热议
+ {volist name="artHot" id="vo" empty="还没有帖子"} +
+ {$vo.title} + {$vo.comments_count} +
+ {/volist} +
@@ -86,27 +78,11 @@ TP5学习制作：Tao.2019
{include file="public/flink" /} -
{/block} + {block name="script"} - {/block} \ No newline at end of file diff --git a/view/taoler/index/login/forget.html b/view/taoler/index/login/forget.html index 20d2ffc..bb30494 100644 --- a/view/taoler/index/login/forget.html +++ b/view/taoler/index/login/forget.html @@ -15,7 +15,7 @@
- {if cache('repass')==1} + {if cache('repass')==1}
@@ -31,10 +31,10 @@
- {elseif cache('repass')==2 /} + {elseif cache('repass')==2 /} - -
{:lang('reset password')}
+ +
{:lang('reset password')}
@@ -76,7 +76,7 @@
该重置密码链接已失效，请重新校验您的信息
非法链接，请重新校验您的信息
- {else /} + {else /}
@@ -103,7 +103,7 @@
- {/if} + {/if}
@@ -118,32 +118,32 @@ $(function() { loading = layer.load(2, { shade: [0.2, '#000'] }); - $.ajax({ - type:"post", - url:"{:url('login/forget')}", - data:$('#form1').serialize(), - daType:"json", - success:function (data){ - if (data.code == 0) { - layer.close(loading); - layer.msg(data.msg,{ - icon:6, - time:2000 - },function(){ - location.href = data.url; - }); - } else { - layer.close(loading); - layer.open({ - title:'发送失败', - content:data.msg, - icon:5, - anim:6 - }); - layui.jquery('#captcha').attr('src', '{:captcha_src()}?id=1'+Math.random()); - } + $.ajax({ + type:"post", + url:"{:url('login/forget')}", + data:$('#form1').serialize(), + daType:"json", + success:function (data){ + if (data.code == 0) { + layer.close(loading); + layer.msg(data.msg,{ + icon:6, + time:2000 + },function(){ + location.href = data.url; + }); + } else { + layer.close(loading); + layer.open({ + title:'发送失败', + content:data.msg, + icon:5, + anim:6 + }); + layui.jquery('#captcha').attr('src', '{:captcha_src()}?id=1'+Math.random()); } - }); + } + }); return false; }); }); @@ -218,22 +218,6 @@ $(function() { }); }); + - - {/block} diff --git a/view/taoler/index/login/login.html b/view/taoler/index/login/login.html index 816e76c..399f45d 100644 --- a/view/taoler/index/login/login.html +++ b/view/taoler/index/login/login.html @@ -63,49 +63,32 @@ $(function() { $('#login').click(function() { - $.ajax({ - type:"post", - url:"{:url('login/index')}", - data:$('form').serialize(), - daType:"json", - success:function (data){ - if (data.code == 0) { - layer.msg(data.msg,{ - icon:6, - time:2000 - }, function(){ - location.href = data.url; - }); - } else { - layer.open({ - title:'登陆失败', - content:data.msg, - icon:5, - anim:6 - }); - layui.jquery('#captcha').attr('src', '{:captcha_src()}?'+Math.random()); - } + $.ajax({ + type:"post", + url:"{:url('login/index')}", + data:$('form').serialize(), + daType:"json", + success:function (data){ + if (data.code == 0) { + layer.msg(data.msg,{ + icon:6, + time:2000 + }, function(){ + location.href = data.url; + }); + } else { + layer.open({ + title:'登陆失败', + content:data.msg, + icon:5, + anim:6 + }); + layui.jquery('#captcha').attr('src', '{:captcha_src()}?'+Math.random()); } - }); + } + }); return false; }); }); - - {/block} \ No newline at end of file diff --git a/view/taoler/index/login/reg.html b/view/taoler/index/login/reg.html index 47edf2a..bcf9783 100644 --- a/view/taoler/index/login/reg.html +++ b/view/taoler/index/login/reg.html @@ -1,5 +1,5 @@ - {extend name="public:base" /} + {block name="title"}注册账号{/block} {block name="column"}{/block} {block name="content"} @@ -67,7 +67,6 @@ - {/block} @@ -78,50 +77,34 @@ $(function() { loading = layer.load(2, { shade: [0.2, '#000'] }); - $.ajax({ - type:"post", - url:"{:url('login/reg')}", - data:$('form').serialize(), - daType:"json", - success:function (data){ - if (data.code == 0) { - layer.close(loading); - layer.msg(data.msg,{ - icon:6, - time:2000 - },function(){ - location.href = data.url; - }); - } else { - layer.close(loading); - layer.open({ - title:'注册失败', - content:data.msg, - icon:5, - anim:6 - }); - layui.jquery('#captcha').attr('src', '{:captcha_src()}?'+Math.random()); - } + $.ajax({ + type:"post", + url:"{:url('login/reg')}", + data:$('form').serialize(), + daType:"json", + success:function (data){ + if (data.code == 0) { + layer.close(loading); + layer.msg(data.msg,{ + icon:6, + time:2000 + },function(){ + location.href = data.url; + }); + } else { + layer.close(loading); + layer.open({ + title:'注册失败', + content:data.msg, + icon:5, + anim:6 + }); + layui.jquery('#captcha').attr('src', '{:captcha_src()}?'+Math.random()); } - }); + } + }); return false; }); }); - {/block} diff --git a/view/taoler/index/public/base.html b/view/taoler/index/public/base.html index 1909eaf..f4e8821 100644 --- a/view/taoler/index/public/base.html +++ b/view/taoler/index/public/base.html @@ -31,6 +31,22 @@ {block name="column"}导航{/block} {block name="content"}内容{/block} {include file="public/footer" /} + {block name="script"}{/block} diff --git a/view/taoler/index/public/column.html b/view/taoler/index/public/column.html index 6c75f3b..a7a9438 100644 --- a/view/taoler/index/public/column.html +++ b/view/taoler/index/public/column.html @@ -11,7 +11,7 @@ {/volist}
    • {if session('?user_id')} -
  • {:lang('add post')}
    • +
  • {:lang('my post')}
  • {:lang('my collection')}
    • {/if}