微调

2020-11-05 13:27:12 +08:00
parent 38eff9579c
commit 393552f498
5 changed files with 155 additions and 132 deletions
--- 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', '创建时间');

@@ -58,6 +64,12 @@ class ArticleController extends AdminController
             ->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;
    }
--- a/app/Http/Controllers/ArticleController.php
+++ b/app/Http/Controllers/ArticleController.php
@@ -8,9 +8,11 @@ use App\Models\Category;

 class ArticleController extends Controller
 {
+
    public function index(Category $category)
    {
        $articles = Article::where('category_id', $category->id)
+                           ->where('status', 1)
                           ->orderBy('created_at', 'desc')
                           ->paginate(5);

@@ -20,6 +22,7 @@ class ArticleController extends Controller
    public function show(Article $article)
    {
        $category = $article->category;
+
        return view('articles.show', compact('article', 'category'));
    }

@@ -35,6 +38,7 @@ class ArticleController extends Controller
        $articles = ArticlePicture::where('category_id', $category->id)
                                  ->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'));
    }
+
 }
--- a/public/assets/index/images/idx/idxWeekly_03.jpg
+++ b/public/assets/index/images/idx/idxWeekly_03.jpg
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -1,25 +1,29 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>{{ config('app.name', '') }}</title>
+
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
    <meta name="renderer" content="webkit"/>
    <meta name="force-rendering" content="webkit"/>
-    <meta name="keywords" content="@section('keywords') @show">
-    <meta name="description" content="@section('description') @show">
-    <title>{{ config('app.name', '') }}</title>
-    <link type="text/css" rel="stylesheet" href="{{ asset('assets/index/css/swiper.min.css') }}" />
-    <link type="text/css" rel="stylesheet" href="{{ asset('assets/index/css/style.css') }}" />
+
+    <meta name="keywords" content="@section('keywords') {{ config('app.name', '') }} @show">
+    <meta name="description" content="@section('description') {{ config('app.name', '') }} @show">
+    <link type="text/css" rel="stylesheet" href="{{ asset('assets/index/css/swiper.min.css') }}"/>
+    <link type="text/css" rel="stylesheet" href="{{ asset('assets/index/css/style.css') }}"/>
    <script type="text/javascript" src="{{ asset('assets/index/js/swiper.min.js') }}"></script>
    <style type="text/css">
-        body{background: #f4f5f7}
+        body {
+            background: #f4f5f7
+        }
    </style>
    @yield('css')
    @yield('js')
 </head>
 <body>
-    <!-- 头部 -->
-    <div class="idxTop" style="background-image: url({{ $top_advert->cover_path }});">
+<!-- 头部 -->
+<div class="idxTop" style="background-image: url({{ $top_advert->cover_path }});">
    <div class="idxTop-img">
        <img src="{{ asset('assets/index/images/idx/idx_top_img.png') }}">
    </div>
@@ -27,9 +31,9 @@
        <p>电话：{{ config('mobile') }}</p>
        <p>邮箱：{{ config('email') }}</p>
    </div>
-    </div>
-    <!-- 导航 -->
-    <div class="idxNav">
+</div>
+<!-- 导航 -->
+<div class="idxNav">
    <div class="contant">
        <div class="idxNav-img">
            <p>《黑龙江科学》期刊</p>
@@ -65,12 +69,12 @@
            @endforeach
        </ul>
    </div>
-    </div>
-    @section('content')
+</div>
+@section('content')

-    @show
-    <!-- 尾部 -->
-    <footer class="idxFooter" style="background-image: url({{ asset('assets/index/images/idx/idxFooter.png') }});">
+@show
+<!-- 尾部 -->
+<footer class="idxFooter" style="background-image: url({{ asset('assets/index/images/idx/idxFooter.png') }});">
    <div class="contant">
        <div class="idxFooter-top">
            <div class="idxNav-img">
@@ -111,17 +115,19 @@
        </div>
        <ul class="idxFooter-bottom">
            @foreach ($links as $link)
-                <li> <a href="{{ $link->url }}">{{ $link->title}}</a> </li>
+                <li><a href="{{ $link->url }}">{{ $link->title}}</a></li>
            @endforeach
        </ul>
        <div class="idxFooter-tips">
-                <p>版权所有： 黑龙江易代文化产业有限公司&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://www.beian.miit.gov.cn/" style="color: #fff">黑ICP备18000348号-1</a></p>
-                <p>地址：哈尔滨市嵩山路15号（150090）&nbsp;&nbsp;&nbsp;&nbsp;电话：0451-82316133/82321706&nbsp;&nbsp;&nbsp;&nbsp;E-Mail: hlj16133@163.com</p>
+            <p>版权所有： 黑龙江易代文化产业有限公司&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://www.beian.miit.gov.cn/" style="color: #fff">黑ICP备18000348号-1</a>
+            </p>
+            <p>地址：哈尔滨市嵩山路15号（150090）&nbsp;&nbsp;&nbsp;&nbsp;电话：0451-82316133/82321706&nbsp;&nbsp;&nbsp;&nbsp;E-Mail:
+                hlj16133@163.com</p>
            <p>印刷单位：哈尔滨市工大节能印刷厂&nbsp;&nbsp;&nbsp;&nbsp;总发行：哈尔滨市邮局&nbsp;&nbsp;&nbsp;&nbsp;订阅：全国各地邮局&nbsp;&nbsp;&nbsp;&nbsp;刊期：半月</p>
            <p>广告发布登记编号：哈南市监逛变字【2019】第21号</p>
        </div>
    </div>
-    </footer>
+</footer>
 </body>
@stack('script')
 </html>
--- a/resources/views/layouts/left.blade.php
+++ b/resources/views/layouts/left.blade.php
@@ -1,11 +1,11 @@
-  <div class="mainLeft">
+<div class="mainLeft">
    <div class="newsbox">
        <div class="titbox">
            <p class="ccsl">最新新闻 </p>
        </div>
        <ul>
            @foreach(\App\Models\Article::where('status',1)->orderBy('id','desc')->take(5)->get() as $news)
-        <li><a href="{{ route('articles.show', $news) }}" class="ccsl">{{ $news->title }}</a></li>
+                <li><a href="/articles/{{ $news->id}}" class="ccsl">{{ $news->title }}</a></li>
            @endforeach
        </ul>
    </div>
@@ -14,7 +14,7 @@
            <p class="ccsl">联系我们 </p>
        </div>
        <div class="lxwmbox">
-        <div>黑龙江省杂志社<br /> 联系电话：82316133<br />投稿邮箱：hlj16133@163.com</div>
-      </div>
+            <div>黑龙江省杂志社<br/> 联系电话：82316133<br/>投稿邮箱：hlj16133@163.com</div>
        </div>
    </div>
+</div>