muzi
/
apeblog
mirror of https://github.com/1099438829/apeblog
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修正一些bug

This commit is contained in:
liyukun 2021-08-08 00:20:35 +08:00
parent b1ea0af35c
commit 3ddff74ec1
4 changed files with 1316 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/index/controller/Article.php
View File

@ -44,29 +44,30 @@ class Article extends Base
//读取列表页模板
$listTmp='';
if($dc['type']==0){
$listTmp=$dc['template_lists'];
if(!$listTmp){
if(empty($dc['template'])){
$this->error('请在栏目分类中，指定当前栏目的列表模板！');
}
}
elseif($dc['type']==1){
$listTmp=$dc['template_index'];
if(!$listTmp){
} elseif($dc['type']==1){
if(empty($dc['template'])){
$this->error('请在栏目分类中，指定当前栏目的单篇模板！');
}
//如果是单篇栏目，加载内容
$contentModel=new DocumentCategoryContent();
$contentModel=new DocumentCategoryContent();
$dcContent= $contentModel->find($id);
$dc['content']=$dcContent['content'];
}
if(!is_file(config('view.view_path').'article/'.$listTmp)){
$listTmp=$dc['template'];
if(!is_file(config('view.view_path').'category/'.$listTmp)){
$this->error('模板文件不存在！');
}
trace('列表页模板路径：'.config('view.view_path').'article/'.$listTmp,'debug');
trace('列表页模板路径：'.config('view.view_path').'category/'.$listTmp,'debug');
//文章兼容字段
$dc['category_id']=$dc['id'];
//判断seo标题是否存在
$dc['meta_title']=$dc['meta_title']?$dc['meta_title']:$dc['title'];
//判断SEO 为空则取系统
$article['keywords'] = $dc['keywords']?:web_config('keywords');
$article['description'] = $dc['description']?:web_config('description');
//添加当前页面的位置信息
$dc['position']=tpl_get_position($dc);
//输出文章分类
@ -76,7 +77,9 @@ class Article extends Base
$this->assign('cid',$id);
//缓存当前页面栏目分类树ids
cache('curr_category_patent_id',$dc['pid']?$dc['pid'].','.$id:$id);
return $this->fetch($listTmp);
//去除后缀
$listTmp = substr($listTmp,0,strpos($listTmp,'.'));
return $this->fetch('category/'.$listTmp);
}
public function detail()

2
public/template/default/pc/article/detail.html
View File

@ -57,7 +57,7 @@
{$zzField['create_time']}
</time>
<span class="dot">•</span><i class="fas fa-folder"></i>
<a href="{:url('article/lists')}?category_id={$zzField['category_id']}" rel="category tag"> {$zzField['category_title']}</a>
<a href="{:url('article/lists')}?id={$zzField['category_id']}" rel="category tag"> {$zzField['category_title']}</a>
<span class="dot">•</span>
<span><i class="fa fa-eye" aria-hidden="true"></i>{$zzField['view']} 阅读</span>
</div>

6
public/template/default/pc/article/list_default.html
View File

@ -2,8 +2,8 @@
<html lang="zh">
<head>
<title>{$zzField['title']} - {:web_config("title")}</title>
<meta name="keywords" content="{$zzField['keywords']}">
<meta name="description" content="{$zzField['description']}">
<meta name="keywords" content="{$zzField['keywords']}" />
<meta name="description" content="{$zzField['description']}"/>
{include file="public/head" /}
<link rel="stylesheet" href="__LIB__/nprogress/nprogress.min.css">
@ -57,7 +57,7 @@
{$zzField['create_time']}
</time>
<span class="dot">•</span><i class="fas fa-folder"></i>
<a href="{:url('article/lists')}?category_id={$zzField['category_id']}" rel="category tag"> {$zzField['category_title']}</a>
<a href="{:url('article/lists')}?id={$zzField['category_id']}" rel="category tag"> {$zzField['category_title']}</a>
<span class="dot">•</span>
<span><i class="fa fa-eye" aria-hidden="true"></i>{$zzField['view']} 阅读</span>
</div>

1299
public/template/default/pc/category/list_default.html Normal file
View File

File diff suppressed because it is too large Load Diff