xuanchen/new_dqb_new
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新

Browse Source
This commit is contained in:
徐永宾
2021-06-08 10:22:00 +08:00
parent c976279f59
commit 73823d24cb
6 changed files with 79 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Admin/Controllers/Article/IndexController.php
View File

@@ -39,7 +39,7 @@ class IndexController extends AdminController
return $this->categories()->pluck('title');
})->label();
$grid->column('title', '文章标题');
$grid->column('sort', '序号');
$grid->column('sort', '序号')->editable();
$states = [
'on' => ['value' => 1, 'text' => '打开', 'color' => 'primary'],
'off' => ['value' => 2, 'text' => '关闭', 'color' => 'default'],
@@ -62,7 +62,7 @@ class IndexController extends AdminController
$form->belongsToMany('categories', CategorySelectAble::class, __('关联分类'))->required();
$form->textarea('description', '内容简介');
$form->text('duty', '职务')->help('领导班子需要添加此数据');
$form->text('rank', '职称')->help('领导班子需要添加此数据');

15
app/Helpers/function.php
View File

@@ -53,7 +53,8 @@ function getOneArticleBYCate($categoryId, $result = '')
->whereHas('categories', function ($q) use ($categoryId) {
$q->where('id', $categoryId);
})
->latest()
->latest('sort')
->latest('created_at')
->first();
if ($info) {
@@ -87,7 +88,8 @@ function getArticlesBYCate($categoryId, $take = 8, $mark = 'one', $hasCover = fa
->whereHas('categories', function ($q) use ($categoryId) {
$q->where('id', $categoryId);
})
->orderBy('sort', $order)
->latest('sort')
->latest('created_at')
->when($hasCover, function ($q) {
$q->whereNotNull('cover');
})
@@ -104,7 +106,8 @@ function getArticlesBYCate($categoryId, $take = 8, $mark = 'one', $hasCover = fa
->when($hasCover, function ($q) {
$q->whereNotNull('cover');
})
->orderBy('sort', $order)
->latest('sort')
->latest('created_at')
->take($take)
->get();
}
@@ -179,7 +182,8 @@ function getArticlesByCateIds($take = 8, $hasCover = false)
->whereHas('categories', function ($q) use ($ids) {
$q->whereIn('id', $ids);
})
->latest()
->latest('sort')
->latest('created_at')
->when($hasCover, function ($q) {
$q->whereNotNull('cover')->orWhere('cover', '<>', '');
})
@@ -200,7 +204,8 @@ function getArticlesByCateIds($take = 8, $hasCover = false)
function getArticlesByPosition($postion)
{
$articles = Article::ofPosition($postion)
->latest()
->latest('sort')
->latest('created_at')
->take(5)
->get();