diff --git a/app/Admin/Controllers/Article/ArticleController.php b/app/Admin/Controllers/Article/ArticleController.php
index d86ba30..d8c2dca 100644
--- a/app/Admin/Controllers/Article/ArticleController.php
+++ b/app/Admin/Controllers/Article/ArticleController.php
@@ -10,6 +10,7 @@ use Encore\Admin\Grid;
class ArticleController extends AdminController
{
+
protected $title = '内容管理';
public function grid()
@@ -31,6 +32,11 @@ class ArticleController extends AdminController
$grid->column('cover', '封面图片')->image('', 100);
$grid->column('category.title', '所属分类');
$grid->column('title', '文章标题');
+ $states = [
+ 'on' => ['value' => 1, 'text' => '打开', 'color' => 'primary'],
+ 'off' => ['value' => 0, 'text' => '关闭', 'color' => 'default'],
+ ];
+ $grid->column('status', '状态')->switch($states);
$grid->column('sort', '序号');
$grid->column('created_at', '创建时间');
@@ -43,21 +49,27 @@ class ArticleController extends AdminController
$form->text('title', '文章标题')->rules('min:2');
$form->select('category_id', '所属分类')
- ->options(Category::selectOptions(function ($model) {
- return $model->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
- }, '选择分类'))
- ->rules('required|min:1', [
- 'required' => '必须选择所属分类',
- 'min' => '必须选择所属分类',
- ]);
+ ->options(Category::selectOptions(function ($model) {
+ return $model->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
+ }, '选择分类'))
+ ->rules('required|min:1', [
+ 'required' => '必须选择所属分类',
+ 'min' => '必须选择所属分类',
+ ]);
$form->text('keywords', '关键词')->rules('nullable');
$form->textarea('description', '内容简介')->rules('max:350');
$form->image('cover', '封面')
- ->move('images/' . date('Y/m/d'))
- ->removable()
- ->uniqueName();
+ ->move('images/' . date('Y/m/d'))
+ ->removable()
+ ->uniqueName();
$form->ueditor('content', '文章内容')->rules('required', ['required' => '详情不能为空']);
$form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
+ $states = [
+ 'on' => ['value' => 1, 'text' => '打开', 'color' => 'success'],
+ 'off' => ['value' => 0, 'text' => '关闭', 'color' => 'danger'],
+ ];
+
+ $form->switch('status', '状态')->states($states);
return $form;
}
diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
index 6cf1bee..bc45aab 100644
--- a/app/Http/Controllers/ArticleController.php
+++ b/app/Http/Controllers/ArticleController.php
@@ -8,11 +8,13 @@ use App\Models\Category;
class ArticleController extends Controller
{
+
public function index(Category $category)
{
$articles = Article::where('category_id', $category->id)
- ->orderBy('created_at', 'desc')
- ->paginate(5);
+ ->where('status', 1)
+ ->orderBy('created_at', 'desc')
+ ->paginate(5);
return view('articles.index', compact('articles', 'category'));
}
@@ -20,6 +22,7 @@ class ArticleController extends Controller
public function show(Article $article)
{
$category = $article->category;
+
return view('articles.show', compact('article', 'category'));
}
@@ -33,8 +36,9 @@ class ArticleController extends Controller
public function picture(Category $category)
{
$articles = ArticlePicture::where('category_id', $category->id)
- ->orderBy('created_at', 'desc')
- ->paginate(12);
+ ->orderBy('created_at', 'desc')
+ ->paginate(12);
+
return view('articles.picture', compact('articles', 'category'));
}
@@ -42,4 +46,5 @@ class ArticleController extends Controller
{
return view('articles.picshow', compact('article'));
}
+
}
diff --git a/public/assets/index/images/idx/idxWeekly_03.jpg b/public/assets/index/images/idx/idxWeekly_03.jpg
index e69de29..578420b 100644
Binary files a/public/assets/index/images/idx/idxWeekly_03.jpg and b/public/assets/index/images/idx/idxWeekly_03.jpg differ
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 2ffaedb..9ad0c8e 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -1,127 +1,133 @@
-
+ {{ config('app.name', '') }}
+
+
-
-
- {{ config('app.name', '') }}
-
-
+
+
+
+
+
@yield('css')
@yield('js')
-
-
-
-
 }})
-
-
-
电话:{{ config('mobile') }}
-
邮箱:{{ config('email') }}
-
+
+
+
+
-
-
-
-
-
《黑龙江科学》期刊
-
Heilongjiang scientific journals
-
-
+
+
+
+
+
《黑龙江科学》期刊
+
Heilongjiang scientific journals
+
+
+ @endforeach
+
+
+
+@section('content')
+
+@show
+
+
@stack('script')
diff --git a/resources/views/layouts/left.blade.php b/resources/views/layouts/left.blade.php
index bf95e53..e124117 100644
--- a/resources/views/layouts/left.blade.php
+++ b/resources/views/layouts/left.blade.php
@@ -1,20 +1,20 @@
-
+
-
-
- @foreach(\App\Models\Article::where('status',1)->orderBy('id','desc')->take(5)->get() as $news)
- - {{ $news->title }}
- @endforeach
-
+
+
+ @foreach(\App\Models\Article::where('status',1)->orderBy('id','desc')->take(5)->get() as $news)
+ - {{ $news->title }}
+ @endforeach
+
-
-
-
黑龙江省杂志社
联系电话:82316133
投稿邮箱:hlj16133@163.com
-
+
+
+
黑龙江省杂志社
联系电话:82316133
投稿邮箱:hlj16133@163.com
+
-
+