diff --git a/app/Admin/Controllers/Article/IndexController.php b/app/Admin/Controllers/Article/IndexController.php index 5be6ee6..b69dff5 100644 --- a/app/Admin/Controllers/Article/IndexController.php +++ b/app/Admin/Controllers/Article/IndexController.php @@ -26,7 +26,7 @@ class IndexController extends AdminController }, '所有分类')); }); $filter->column(1 / 2, function ($filter) { - $filter->equal('position', '定位') + $filter->equal('position', '首页推荐位') ->select(Article::POSITIONS); }); @@ -76,7 +76,7 @@ class IndexController extends AdminController $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先'); $form->switch('status', '状态')->default(1); $form->text('url', '外链地址'); - $form->select('position', '定位') + $form->select('position', '首页推荐位') ->options(Article::POSITIONS); $form->datetime('created_at', '发布时间'); $form->saved(function ($form) { diff --git a/app/Admin/Controllers/Category/IndexController.php b/app/Admin/Controllers/Category/IndexController.php index 013b6f0..156dd5b 100644 --- a/app/Admin/Controllers/Category/IndexController.php +++ b/app/Admin/Controllers/Category/IndexController.php @@ -55,7 +55,7 @@ class IndexController extends AdminController ->removable() ->uniqueName(); $form->number('order', '排序')->default(0); - $form->switch('top_show', '顶部导航显示')->states()->default(0); + // $form->switch('top_show', '顶部导航显示')->states()->default(0); $form->switch('status', '显示')->states()->default(1); $form->text('url', '跳转地址')->help('设置后直接跳转到设置的url'); @@ -122,7 +122,7 @@ class IndexController extends AdminController $form->number('order', '排序')->default(0)->help('正序优先'); $form->switch('status', '显示')->states()->default(1); - $form->switch('top_show', '顶部导航显示')->states(); + // $form->switch('top_show', '顶部导航显示')->states(); $form->text('url', '跳转地址')->help('设置后直接跳转到设置的url'); $form->saving(function (Form $form) { diff --git a/app/Helpers/function.php b/app/Helpers/function.php index daf3c0e..e3d2368 100644 --- a/app/Helpers/function.php +++ b/app/Helpers/function.php @@ -182,10 +182,12 @@ function getArtilesByCates($cate_id, $take = 8) $cate_ids = Category::where('parent_id', $cate_id) ->orWhere('id', $cate_id) ->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]) - ->get(); + ->pluck('id') + ->toArray(); return Article::whereIn('category_id', $cate_ids) ->latest() + ->take($take) ->get(); } diff --git a/resources/views/category/kxyj.blade.php b/resources/views/category/kxyj.blade.php index 28036c4..2867de7 100644 --- a/resources/views/category/kxyj.blade.php +++ b/resources/views/category/kxyj.blade.php @@ -15,7 +15,6 @@
梯队介绍: - {{ $talent->description }} - + {{ $talent->description }} +
{{ $pos_b->title }}
-{{ $pos_b->created_at->format('Y-m-d') }}
++ {{-- {{ $pos_b->created_at->format('Y-m-d') }}--}} +
@endif{{ $pos_c->title }}
-{{ $pos_c->created_at->format('Y-m-d') }}
+ ++ {{-- {{ $pos_c->created_at->format('Y-m-d') }}--}} +
@endif