初步完成

2020-09-11 10:27:23 +08:00
parent 9c6d4da51e
commit 49c3511dbe
43 changed files with 3437 additions and 1188 deletions
--- a/app/Admin/Controllers/Advert/IndexController.php
+++ b/app/Admin/Controllers/Advert/IndexController.php
@@ -24,7 +24,7 @@ class IndexController extends AdminController
        $grid->filter(function ($filter) {
            $filter->column(1 / 2, function ($filter) {
                $filter->like('title', '图片名称');
-                $filter->like('category.id', '分类名称')->select(Category::selectOptions(function ($model) {
+                $filter->equal('category.id', '分类名称')->select(Category::selectOptions(function ($model) {
                    return $model->where('status', 1)->where('type', Category::TYPE_ADVERT);
                }, '所有分类'));
            });
--- a/app/Admin/Controllers/Article/ArticleController.php
+++ b/app/Admin/Controllers/Article/ArticleController.php
@@ -8,8 +8,9 @@ use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;

-class ArticleController extends AdminController
+class IndexController extends AdminController
 {
+
    protected $title = '内容管理';

    public function grid()
@@ -19,7 +20,7 @@ class ArticleController extends AdminController
        $grid->filter(function ($filter) {
            $filter->column(1 / 2, function ($filter) {
                $filter->like('title', '文章标题');
-                $filter->like('category.id', '所属分类')->select(Category::selectOptions(function ($model) {
+                $filter->equal('category.id', '所属分类')->select(Category::selectOptions(function ($model) {
                    return $model->where('status', 1)->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
                }, '所有分类'));
            });
@@ -32,6 +33,10 @@ class ArticleController extends AdminController
        $grid->column('category.title', '所属分类');
        $grid->column('title', '文章标题');
        $grid->column('sort', '序号');
+        $grid->status('状态')->switch([
+            'on'  => ['value' => 1, 'text' => '正常', 'color' => 'primary'],
+            'off' => ['value' => 0, 'text' => '关闭', 'color' => 'danger'],
+        ]);
        $grid->column('created_at', '创建时间');

        return $grid;
@@ -46,18 +51,27 @@ class ArticleController extends AdminController
             ->options(Category::selectOptions(function ($model) {
                 return $model->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
             }, '选择分类'))
+             ->when('in', [3, 29], function (Form $form) {
+                 $form->text('working', '工龄');
+                 $form->text('job', '岗位');
+             })
+             ->when('in', [56], function (Form $form) {
+                 $form->text('url', '跳转地址');
+             })
             ->rules('required|min:1', [
                 'required' => '必须选择所属分类',
                 'min'      => '必须选择所属分类',
             ]);
-        $form->text('keywords', '关键词')->rules('nullable');
+        //        $form->text('keywords', '关键词')->rules('nullable');
        $form->textarea('description', '内容简介')->rules('max:350');
        $form->image('cover', '封面')
             ->move('images/' . date('Y/m/d'))
             ->removable()
             ->uniqueName();
+
        $form->ueditor('content', '文章内容')->rules('required', ['required' => '详情不能为空']);
        $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
+        $form->switch('status', '状态')->default(1);

        return $form;
    }
--- a/app/Admin/Controllers/Article/PatentController.php
+++ b/app/Admin/Controllers/Article/PatentController.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Admin\Controllers\Article;
+
+use App\Models\Category;
+use App\Models\Patent;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+
+class PatentController extends AdminController
+{
+
+    protected $title = '专利论文';
+
+    public function grid()
+    {
+        $grid = new Grid(new Patent);
+        $grid->model()->orderBy('id', 'desc');
+
+        $grid->filter(function ($filter) {
+            $filter->column(1 / 2, function ($filter) {
+                $filter->like('title', '专利/论文题目');
+                $filter->equal('category_id', '所属分类')
+                       ->select(Category::where('type', Category::TYPE_PATENT)->pluck('title', 'id'));
+                $filter->equal('type', '类别')
+                       ->select(Patent::TYPES);
+            });
+
+            $filter->column(1 / 2, function ($filter) {
+                $filter->like('number', '专利号');
+                $filter->like('nickname', '第一发明人/论文作者');
+            });
+
+            $filter->disableIdFilter();
+        });
+
+        $grid->column('id', '#ID#');
+        $grid->column('type', '类别')->using(Patent::TYPES)->label();
+        $grid->column('title', '专利/论文题目');
+        $grid->column('number', '专利号');
+        $grid->column('category.title', '所属分类');
+        $grid->column('nickname', '第一发明人/论文作者');
+        $grid->column('created_at', '创建时间');
+
+        return $grid;
+    }
+
+    public function form()
+    {
+        $form = new Form(new Patent);
+
+        $form->text('title', '题目')->required();
+        $form->select('type', '类别')
+             ->options(Patent::TYPES)
+             ->when('patent', function (Form $form) {
+                 $form->select('category_id', '专利类别')
+                      ->options(Category::selectOptions(function ($model) {
+                          return $model->whereIn('type', [Category::TYPE_PATENT]);
+                      }, '专利类别'));
+                 $form->text('number', '专利号');
+
+             })
+             ->when('paper', function (Form $form) {
+                 $form->text('publication', '刊物名称');
+             })
+             ->required();
+
+        $form->text('nickname', '第一发明人/论文作者')->required();
+
+        $form->image('cover', '封面')
+             ->move('images/' . date('Y/m/d'))
+             ->removable()
+             ->uniqueName();
+
+        $form->ueditor('content', '详情')->rules('required', ['required' => '详情不能为空']);
+        $form->number('sort', '序号')->default(0)->required()->help('倒序优先');
+        $form->switch('status', '显示')->states()->default(1);
+
+        return $form;
+    }
+
+}
--- a/app/Admin/Controllers/Article/PictureController.php
+++ b/app/Admin/Controllers/Article/PictureController.php
@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Admin\Controllers\Article;
-
-use App\Models\ArticlePicture;
-use Encore\Admin\Controllers\AdminController;
-use Encore\Admin\Form;
-use Encore\Admin\Grid;
-
-class PictureController extends AdminController
-{
-    protected $title = '随手拍';
-
-    public function grid()
-    {
-        $grid = new Grid(new ArticlePicture);
-        $grid->model()->orderBy('id', 'desc');
-        $grid->filter(function ($filter) {
-            $filter->column(1 / 2, function ($filter) {
-                $filter->like('title', '文章标题');
-            });
-
-            $filter->disableIdFilter();
-        });
-
-        $grid->column('id', '#ID#');
-        $grid->column('cover')->display(function () {
-            return $this->one_picture_path;
-        })->image('', 100);
-        $grid->column('category.title', '所属分类');
-        $grid->column('title', '文章标题');
-        $grid->column('sort', '序号');
-        $grid->column('created_at', '创建时间');
-
-        return $grid;
-    }
-
-    public function form()
-    {
-        $form = new Form(new ArticlePicture);
-
-        $form->text('title', '文章标题')->rules('min:2');
-        $form->hidden('category_id')->value(6);
-        $form->multipleImage('pictures', '封面')
-            ->move('images/' . date('Y/m/d'))
-            ->removable()
-            ->uniqueName();
-
-        $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
-
-        return $form;
-    }
-
-}
--- a/app/Admin/Controllers/Category/IndexController.php
+++ b/app/Admin/Controllers/Category/IndexController.php
@@ -33,8 +33,7 @@ class IndexController extends AdminController
                $form->select('parent_id', '上级分类')
                     ->options(Category::selectOptions(function ($model) {
                         return $model->where('status', 1);
-                    }, '一级分类'))
-                ;
+                     }, '一级分类'));
                $form->text('title', '分类名称')->rules('required');
                $form->select('type', '分类类型')
                     ->options(Category::TYPES)
@@ -56,7 +55,7 @@ class IndexController extends AdminController
                     ->removable()
                     ->uniqueName();
                $form->number('order', '排序')->default(0);
-                $form->switch('top_show', '顶部导航显示')->states()->default(1);
+                $form->switch('top_show', '顶部导航显示')->states()->default(0);
                $form->switch('status', '显示')->states()->default(1);
                $form->action(admin_url('categories'));

@@ -126,14 +125,14 @@ class IndexController extends AdminController
        $form->saving(function (Form $form) {

            if (request()->has('title')) {
-                if (request()->type == Category::TYPE_SHOW && empty(request()->article_id)) {
-                    $error = new MessageBag([
-                        'title'   => '错误',
-                        'message' => '文章类型是文章详情的时候需要选择关联文章',
-                    ]);
-
-                    return back()->withInput()->with(compact('error'));
-                }
+                //                if (request()->type == Category::TYPE_SHOW && empty(request()->article_id)) {
+                //                    $error = new MessageBag([
+                //                        'title'   => '错误',
+                //                        'message' => '文章类型是文章详情的时候需要选择关联文章',
+                //                    ]);
+                //
+                //                    return back()->withInput()->with(compact('error'));
+                //                }
            }

        });
--- a/app/Admin/Routes/article.php
+++ b/app/Admin/Routes/article.php
@@ -7,6 +7,6 @@ Route::group([
    'namespace'  => config('admin.route.namespace') . '\\Article',
    'middleware' => config('admin.route.middleware'),
 ], function (Router $router) {
-    $router->resource('articles', 'ArticleController');
-    $router->resource('pictures', 'PictureController');
+    $router->resource('articles', 'IndexController');
+    $router->resource('patents', 'PatentController');
 });
--- a/app/Helpers/function.php
+++ b/app/Helpers/function.php
@@ -0,0 +1,96 @@
+<?php
+
+use App\Models\Category;
+use App\Models\Article;
+use App\Models\Patent;
+
+function getOneCategory($categoryId, $return = '')
+{
+    $category = Category::find($categoryId);
+    if ($category) {
+        if ($return) {
+            return $category->{$return};
+        }
+
+        return $category;
+    }
+
+    return new Category;
+}
+
+/**
+ * Notes: 获取文章分类详情
+ * @Author: 玄尘
+ * @Date  : 2020/9/10 13:21
+ * @param        $categoryId
+ * @param string $result
+ * @return \App\Models\Article
+ */
+function getOneArticleBYCate($categoryId, $result = '')
+{
+    $info = Article::where('category_id', $categoryId)->latest('sort')->latest()->first();
+
+    if ($info) {
+        if ($result) {
+            return $info->{$result};
+        }
+
+        return $info;
+    } else {
+        return '';
+    }
+
+    return new Article;
+}
+
+/**
+ * Notes: 获取分类下的文章
+ * @Author: 玄尘
+ * @Date  : 2020/9/10 10:05
+ * @param $categoryId
+ * @param $take
+ * @return \App\Models\Article
+ */
+function getArticlesBYCate($categoryId, $take)
+{
+    $articles = Article::where('category_id', $categoryId)
+                       ->where('status', 1)
+                       ->latest('sort')
+                       ->latest()
+                       ->take($take)
+                       ->get();
+
+    return $articles;
+}
+
+//获取子分类
+function getCateChild($categoryId)
+{
+    return Category::where('status', 1)
+                   ->where('parent_id', $categoryId)
+                   ->orderBy('order', 'asc')
+                   ->get();
+}
+
+//获取顶级分类
+function getTopCate($categoryId)
+{
+    $parent = Category::find($categoryId);
+
+    while ($parent->parent_id != 0) {
+        $parent = $parent->parent;
+    }
+
+    return $parent;
+}
+
+//获取专利和论文
+function getPatent($take, $type = '')
+{
+    return Patent::where('status', 1)
+                 ->when($type, function ($q) use ($type) {
+                     $q->where('type', $type);
+                 })
+                 ->get();
+
+}
--- a/app/Http/Controllers/ArticleController.php
+++ b/app/Http/Controllers/ArticleController.php
@@ -3,11 +3,13 @@
 namespace App\Http\Controllers;

 use App\Models\Article;
-use App\Models\ArticlePicture;
 use App\Models\Category;
+use Illuminate\Http\Request;

 class ArticleController extends Controller
 {
+
+    //文章列表
    public function index(Category $category)
    {
        $articles = Article::where('category_id', $category->id)
@@ -17,29 +19,33 @@ class ArticleController extends Controller
        return view('articles.index', compact('articles', 'category'));
    }

+    //显示详情
    public function show(Article $article)
    {
+        if ($article->url) {
+            return redirect($article->url);
+        }
+
        $category = $article->category;
-        return view('articles.show', compact('article', 'category'));
+
+        $next   = Article::where('id', '>', $article->id)->where('status', 1)->first();
+        $parent = getTopCate($category->id);
+
+        return view('articles.show', compact('article', 'category', 'next', 'parent'));
    }

-    public function category(Category $category)
+    //搜索
+    public function search(Request $request)
    {
-        $article = Article::where('category_id', $category->id)->first();
+        $title    = $request->title;
+        $articles = Article::where('status', 1)
+                           ->when($title, function ($q) use ($title) {
+                               $q->where('title', 'like', "%{$title}%");
+                           })
+                           ->paginate();
+
+        return view('articles.search', compact('articles'));

-        return view('articles.show', compact('article'));
    }

-    public function picture(Category $category)
-    {
-        $articles = ArticlePicture::where('category_id', $category->id)
-            ->orderBy('created_at', 'desc')
-            ->paginate(12);
-        return view('articles.picture', compact('articles', 'category'));
-    }
-
-    public function picshow(ArticlePicture $article)
-    {
-        return view('articles.picshow', compact('article'));
-    }
 }
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -2,20 +2,38 @@

 namespace App\Http\Controllers;

+use App\Models\Article;
 use App\Models\Category;

 class CategoryController extends Controller
 {

-    /**
-     * Notes: 分类下的文章
-     * @Author: 玄尘
-     * @Date  : 2020/6/1 9:19
-     * @param \App\Models\Category $category
-     */
-    public function articles(Category $category)
+    //显示分类
+    public function show(Category $category)
    {
+        if ($category->type == Category::TYPE_SHOW) {
+            if ($category->relations) {
+                return route('article.show', $category->relations);
+            }
+        }
+        $parent = getTopCate($category->id);
+
+        $template = array_flip(config('haai.category'));
+        if (isset($template[$category->id])) {
+            return view('category.' . $template[$category->id], compact('category', 'parent'));
+        }
+
+        return redirect(route('category.list', $category));

    }

+    //显示文章列表
+    public function list(Category $category)
+    {
+        $articles = Article::where('category_id', $category->id)->where('status', 1)->paginate();
+        $parent   = getTopCate($category->id);
+
+        return view('category.list', compact('category', 'parent', 'articles'));
+    }
+
 }
--- a/app/Http/Controllers/IndexController.php
+++ b/app/Http/Controllers/IndexController.php
@@ -5,6 +5,8 @@ namespace App\Http\Controllers;
 use App\Models\Advert;
 use App\Models\Article;
 use App\Models\ArticlePicture;
+use App\Models\Patent;
+use Illuminate\Support\Arr;

 class IndexController extends Controller
 {
@@ -16,22 +18,32 @@ class IndexController extends Controller
     */
    public function index()
    {
-        $ssp           = ArticlePicture::orderBy('sort', 'desc')->take(3)->get();     //随手拍
-        $all_articles  = Article::orderBy('sort', 'desc')
-                                ->whereNotIn('category_id', [20, 21, 22])
-                                ->take(7)
-                                ->get();                                              //最新资讯
-        $danwei        = Article::where('category_id', 15)->latest()->first();        //单位概况
-        $ysbj          = Article::where('category_id', 12)->latest()->take(3)->get(); //养生保健
-        $dcyfx         = Article::where('category_id', 10)->latest()->take(7)->get(); //调研与分析
-        $yyjcyj        = Article::where('category_id', 9)->latest()->take(7)->get();  //应用基础研究
-        $jsyt          = Article::where('category_id', 11)->latest()->take(7)->get(); //技术研讨
-        $kyyyy         = Article::where('category_id', 12)->latest()->take(7)->get(); //科研与应用
-        $qkys          = Article::where('category_id', 9)->latest()->take(7)->get();  //全科医学
-        $center_advert = Advert::where('category_id', 18)->first();
-        $qikan_advert  = Advert::where('category_id', 19)->take(4)->orderBy('sort', 'desc')->get();
+        //        $ssp           = ArticlePicture::orderBy('sort', 'desc')->take(3)->get();     //随手拍
+        //        $all_articles  = Article::orderBy('sort', 'desc')
+        //                                ->whereNotIn('category_id', [20, 21, 22])
+        //                                ->take(7)
+        //                                ->get();                                              //最新资讯
+        //        $danwei        = Article::where('category_id', 15)->latest()->first();        //单位概况
+        //        $ysbj          = Article::where('category_id', 12)->latest()->take(3)->get(); //养生保健
+        //        $dcyfx         = Article::where('category_id', 10)->latest()->take(7)->get(); //调研与分析
+        //        $yyjcyj        = Article::where('category_id', 9)->latest()->take(7)->get();  //应用基础研究
+        //        $jsyt          = Article::where('category_id', 11)->latest()->take(7)->get(); //技术研讨
+        //        $kyyyy         = Article::where('category_id', 12)->latest()->take(7)->get(); //科研与应用
+        //        $qkys          = Article::where('category_id', 9)->latest()->take(7)->get();  //全科医学
+        //        $center_advert = Advert::where('category_id', 18)->first();
+        //        $qikan_advert  = Advert::where('category_id', 19)->take(4)->orderBy('sort', 'desc')->get();

-        return view('index.index', compact('ssp', 'all_articles', 'danwei', 'ysbj', 'dcyfx', 'yyjcyj', 'jsyt', 'kyyyy', 'qkys', 'center_advert', 'qikan_advert'));
+        $data = [
+            'ysxw'              => Article::where('category_id', 15)->latest('sort')->latest()->take(8)->get(),
+            'kjcg'              => Article::where('category_id', 20)->latest('sort')->latest()->take(8)->get(),
+            'lwzl'              => Patent::latest('sort')->latest()->take(11)->get(),
+            'center_advert'     => Advert::latest('sort')->latest()->where('category_id', 23)->take(3)->get(),
+            'ysxw_right_advert' => Advert::latest('sort')->latest()->where('category_id', 24)->first(),
+            'kjcg_right_advert' => Advert::latest('sort')->latest()->where('category_id', 25)->take(2)->get(),
+            'lwzl_right_advert' => Advert::latest('sort')->latest()->where('category_id', 27)->take(2)->get(),
+        ];
+
+        return view('index.index', $data);
    }

 }
--- a/app/Http/Controllers/PatentController.php
+++ b/app/Http/Controllers/PatentController.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Patent;
+use App\Models\Category;
+use Illuminate\Http\Request;
+
+class PatentController extends Controller
+{
+
+    //显示论文详情
+    public function show(Patent $patent)
+    {
+        $next = Patent::where('id', '>', $patent->id)->where('status', 1)->first();
+
+        return view('patents.show', compact('patent', 'next'));
+    }
+
+    //显示文章列表
+    public function list(Request $request)
+    {
+        $type = $request->type;
+
+        $patents = Patent::where('status', 1)
+                         ->when($type, function ($q) use ($type) {
+                             $q->where('type', $type);
+                         })
+                         ->paginate();
+
+        return view('patents.list', compact('patents'));
+    }
+
+}
--- a/app/Http/Controllers/TestController.php
+++ b/app/Http/Controllers/TestController.php
@@ -2,160 +2,12 @@

 namespace App\Http\Controllers;

-use App\Models\Article;
-use App\Models\Category;
-use App\Models\DedeArchive;
-use App\Models\DedeArctype;
-use App\Traits\Tree;
-
 class TestController extends Controller
 {
-    use Tree;

    public function index()
    {

    }

-    public function setCateArticle()
-    {
-        $article = [];
-        $lists   = Category::where('content', '<>', '')->where('type', 'article')->get();
-        if ($lists->isEmpty()) {
-            dd('没有数据');
-        }
-        foreach ($lists as $key => $cate) {
-            if ($cate->content != '&nbsp;') {
-                $data = [
-                    'oldid'       => 0,
-                    'title'       => $cate->title,
-                    'category_id' => $cate->id,
-                    'writer'      => 'admin',
-                    'source'      => '未知',
-                    'keywords'    => '',
-                    'status'      => 1,
-                    'description' => $cate->description,
-                    'content'     => $cate->content,
-                ];
-
-                $info             = Article::create($data);
-                $cate->article_id = $info->id;
-                $cate->type       = Category::TYPE_SHOW;
-                $cate->save();
-                $article[] = $info->id;
-            }
-
-        }
-        dump(count($article));
-    }
-
-    public function checkArticle()
-    {
-        $articleids = Article::where('oldid', '>', 0)->pluck('oldid');
-        $oldids     = DedeArchive::pluck('id');
-        $diffids    = array_diff($oldids->toArray(), $articleids->toArray());
-        dump(count($articleids));
-        dump(count($oldids));
-        dump($diffids);
-        die();
-        $map = [
-            'id' => ['in', $diffids],
-        ];
-        $list = DedeArchive::whereIn('id', $diffids)->get();
-        foreach ($list as $key => $article) {
-            $data = [
-                'oldid'       => $article->id,
-                'title'       => $article->title,
-                'category_id' => $category->id ?? '0',
-                'writer'      => $article->writer,
-                'cover'       => $article->litpic,
-                'source'      => $article->source,
-                'keywords'    => $article->keywords,
-                'description' => $article->description,
-                'status'      => 1,
-                'content'     => $article->info->body ?? '',
-                'created_at'  => date('Y-m-d H:i:s', $article->pubdate),
-            ];
-            Article::create($data);
-        }
-    }
-
-    //导入文章
-    public function set_article()
-    {
-        $articles = Article::get();
-        if ($articles->count() > 4) {
-            dd('已经导入过数据');
-        }
-        $categorys = Category::get();
-        $error     = $success     = [];
-        DedeArchive::whereNotNull('litpic')->chunk(200, function ($articles) use ($categorys) {
-
-            foreach ($articles as $article) {
-
-                $category = $categorys->where('oldid', $article->typeid)->first();
-                $id       = $category->id ?? 0;
-                if (in_array($id, [9, 10, 11, 12])) {
-                    $data = [
-                        'oldid'       => $article->id,
-                        'title'       => $article->title,
-                        'category_id' => $category->id ?? '0',
-                        'writer'      => $article->writer,
-                        'source'      => $article->source,
-                        'cover'       => $article->litpic,
-                        'keywords'    => $article->keywords,
-                        'description' => $article->description,
-                        'status'      => 1,
-                        'content'     => $article->info->body ?? '',
-                        'created_at'  => date('Y-m-d H:i:s', $article->pubdate),
-                    ];
-
-                    $res = Article::create($data);
-                    if (!$res) {
-                        $error[] = $article->id;
-                    } else {
-                        $success[] = $article->id;
-                    }
-                }
-
-            }
-        });
-
-        dump($error);
-        dump($success);
-    }
-
-    //导入分类
-    public function set_category()
-    {
-        $categorys = Category::get();
-        if ($categorys->count()) {
-            dd('已经导入过数据');
-        }
-        $lists = DedeArctype::where('ishidden', 0)->select('id', 'reid as parent_id', 'typename as title', 'content')->get();
-        $list  = Tree::list2tree($lists->toArray(), 'id', 'parent_id', 'children', 0);
-
-        foreach ($list as $key => $value) {
-            $info = Category::create($this->getData($value));
-            if (isset($value['children']) && count($value['children']) > 0) {
-                foreach ($value['children'] as $key => $children) {
-                    $info->children()->create($this->getData($children));
-                }
-            }
-        }
-    }
-
-    //格式化分类数据
-    public function getData($category)
-    {
-        $data = [
-            'oldid'     => $category['id'],
-            'parent_id' => $category['parent_id'],
-            'title'     => $category['title'],
-            'content'   => $category['content'],
-            'status'    => 1,
-        ];
-        return $data;
-    }
-
 }
--- a/app/Models/Article.php
+++ b/app/Models/Article.php
@@ -7,5 +7,12 @@ use App\Models\Traits\HasOneCover;

 class Article extends Model
 {
+
    use HasOneCover, BelongsToCategory;
+
+    public function getLinkAttribute()
+    {
+        return route('article.show', $this);
+    }
+
 }
--- a/app/Models/ArticlePicture.php
+++ b/app/Models/ArticlePicture.php
@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Models\Traits\BelongsToCategory;
-use Illuminate\Support\Facades\Storage;
-
-class ArticlePicture extends Model
-{
-    use BelongsToCategory;
-
-    public function setPicturesAttribute($pictures)
-    {
-        if (is_array($pictures)) {
-            $this->attributes['pictures'] = json_encode($pictures);
-        }
-    }
-
-    public function getPicturesAttribute($pictures)
-    {
-        return json_decode($pictures, true);
-    }
-
-    public function getOnePicturePathAttribute(): string
-    {
-        $cover = $this->pictures;
-        if (empty($cover)) {
-            return '';
-        } else {
-            return Storage::disk('public')->url($cover[0]);
-        }
-    }
-}
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -2,6 +2,7 @@

 namespace App\Models;

+use App\Models\Traits\HasOneCover;
 use Encore\Admin\Traits\AdminBuilder;
 use Encore\Admin\Traits\ModelTree;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -9,19 +10,24 @@ use Illuminate\Database\Eloquent\Relations\HasMany;

 class Category extends Model
 {
-    use AdminBuilder, ModelTree;

-    public const TYPES = [
-        'article' => '文章列表',
-        'show'    => '文章详情',
-        'advert'  => '广告',
-        'picture' => '图册',
-    ];
+    use AdminBuilder, ModelTree, HasOneCover;

    public const TYPE_SHOW    = 'show';
    public const TYPE_ARTICLE = 'article';
    public const TYPE_ADVERT  = 'advert';
-    public const TYPE_PICTURE = 'picture';
+    public const TYPE_PATENT  = 'patent';
+    public const TYPES        = [
+        self::TYPE_ARTICLE => '文章列表',
+        self::TYPE_SHOW    => '文章详情',
+        self::TYPE_ADVERT  => '图片',
+        self::TYPE_PATENT  => '专利',
+    ];
+
+    public function getLinkAttribute()
+    {
+        return route('category.show', $this);
+    }

    /**
     * 关联的数据
--- a/app/Models/DedeAddonarticle.php
+++ b/app/Models/DedeAddonarticle.php
@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Models;
-
-class DedeAddonarticle extends Model
-{
-}
--- a/app/Models/DedeArchive.php
+++ b/app/Models/DedeArchive.php
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Models;
-
-class DedeArchive extends Model
-{
-    public function info()
-    {
-        return $this->hasOne(DedeAddonarticle::class, 'aid');
-    }
-}
--- a/app/Models/DedeArctype.php
+++ b/app/Models/DedeArctype.php
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Encore\Admin\Traits\AdminBuilder;
-use Encore\Admin\Traits\ModelTree;
-
-class DedeArctype extends Model
-{
-    use AdminBuilder, ModelTree;
-}
--- a/app/Models/Patent.php
+++ b/app/Models/Patent.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Models;
+
+use App\Models\Traits\BelongsToCategory;
+use App\Models\Traits\HasOneCover;
+
+class Patent extends Model
+{
+
+    use HasOneCover, BelongsToCategory;
+
+    public const TYPE_PATENT = 'patent';
+    public const TYPE_PAPER  = 'paper';
+
+    public const TYPES = [
+        self::TYPE_PATENT => '专利',
+        self::TYPE_PAPER  => '论文',
+    ];
+
+    public function getLinkAttribute()
+    {
+        return route('patents.show', $this);
+    }
+
+}
--- a/composer.json
+++ b/composer.json
@@ -40,6 +40,9 @@
        "classmap": [
            "database/seeds",
            "database/factories"
+        ],
+        "files": [
+            "app/Helpers/function.php"
        ]
    },
    "autoload-dev": {
--- a/config/admin.php
+++ b/config/admin.php
@@ -11,7 +11,7 @@ return [
    | login page.
    |
     */
-    'name'                      => '黑龙江科学杂志',
+    'name'                      => '黑龙江省科学院智能制造研究所',

    /*
    |--------------------------------------------------------------------------
@@ -22,7 +22,7 @@ return [
    | `img` tag, eg '<img src="http://logo-url" alt="Admin logo">'.
    |
     */
-    'logo'                      => '<b>科学</b>杂志',
+    'logo'                      => '<b>智能</b>制造',

    /*
    |--------------------------------------------------------------------------
@@ -34,7 +34,7 @@ return [
    | '<img src="http://logo-url" alt="Admin logo">'.
    |
     */
-    'logo-mini'                 => '<b>kxzz</b>',
+    'logo-mini'                 => '<b>haai</b>',

    /*
    |--------------------------------------------------------------------------
@@ -399,7 +399,7 @@ return [
        'ueditor' => [
            // 如果要关掉这个扩展，设置为false
            'enable'     => true,
-            // 编辑器的前端配置 参考：http://fex.baidu.com/ueditor/#start-config
+            // 编辑器的前端配置 参考：http://fex.BAIDU.com/ueditor/#start-config
            'config'     => [
                'initialFrameHeight' => 400, // 例如初始化高度
            ],
--- a/config/haai.php
+++ b/config/haai.php
@@ -0,0 +1,16 @@
+<?php
+
+//整个网站配置  固定的也不需要放到后台了
+return [
+    'category' => [
+        'zzjg'   => 1,//组织机构
+        'kxyj'   => 10,//科学研究
+        'cgzh'   => 19,//成果展示
+        'rcdw'   => 28,//人才队伍
+        'djkxwh' => 31,//党建与科学文化
+    ],
+    //分类使用的模板
+    'template' => [
+        config('haai.category.zzjg') => 'category.zzjg',
+    ],
+];
--- a/public/assets/index/css/style.css
+++ b/public/assets/index/css/style.css
--- a/public/assets/index/js/cjango.js
+++ b/public/assets/index/js/cjango.js
@@ -0,0 +1,7 @@
+$('[data-href]').on('click', function (event) {
+    event.preventDefault();
+    if ($(this).hasClass('ajax-get') || $(this).hasClass('ajax-post')) {
+        return;
+    }
+    location.href = $(this).data('href');
+});
--- a/resources/views/articles/picshow.blade.php
+++ b/resources/views/articles/picshow.blade.php
@@ -1,60 +0,0 @@
-@extends('layouts.app')
-
-@section('title', '')
-
-@section('keywords', $article->keywords)
-@section('description', $article->description)
-
-@section('css')
-<link type="text/css" rel="stylesheet" href="{{ asset('assets/index/css/style.css') }}" />
-<link type="text/css" rel="stylesheet" href="{{ asset('assets/index/css/style2.css') }}" />
-<link rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/all.min.css'>
-@endsection
-
-@section('content')
-<div class="mabody">
-<div class="mainWarp">
-  @include('layouts.left')
-    <div class="mainRight">
-    <div class="brandnavbox">
-       <p class="ccsl">{{ $article->title }}</p>
-       <div class="con ccsl">首页 > {{ $article->category->title }} ></div>
-    </div>
-        <div class="detailbox">
-      <div class="carousel">
-        <div class="btn btn-back hidden">
-          <i class="fas fa-arrow-left"></i>
-          <i class="fas fa-chevron-left left-indicator"></i>
-        </div>
-        <div class="viewbox">
-          <div class="track">
-            @foreach($article->pictures as $key => $picture)
-            <div class="slide @if($key == 0) active @endif">
-              <img class="images" src="{{ \Storage::disk('public')->url($picture) }}" />
-            </div>
-            @endforeach
-          </div>
-        </div>
-        <div class="btn btn-next">
-          <i class="fas fa-arrow-right"></i>
-          <i class="fas fa-chevron-right right-indicator"></i>
-        </div>
-        <div class="nav-indicator">
-          @foreach($article->pictures as $key => $picture)
-          <div class="dot @if($key == 0) active @endif"></div>
-          @endforeach
-        </div>
-      </div>
-    </div>
-    <div class="clear"></div>
-  </div>
-  <div class="clear"></div>
-</div>
-</div>
-<div class="clear"></div>
-@endsection
-@push('script')
-<script src="{{ asset('assets/index/js/TimelineMax.min.js') }}"></script>
-<script src="{{ asset('assets/index/js/TweenMax.min.js') }}"></script>
-<script src="{{ asset('assets/index/js/script.js') }}"></script>
-@endpush
--- a/resources/views/articles/picture.blade.php
+++ b/resources/views/articles/picture.blade.php
@@ -1,33 +0,0 @@
-@extends('layouts.app')
-
-@section('title', '')
-@section('keywords', $category->keywords)
-@section('description', $category->description)
-
-@section('content')
-<div class="mabody">
-    <div class="mainWarp">
-        @include('layouts.left')
-        <div class="mainRight">
-            <div class="brandnavbox">
-                <p class="ccsl">{{ $category->title }}</p>
-                <div class="con ccsl">首页 > {{ $category->title }} ></div>
-            </div>
-            <ul class="piclistul">
-                @foreach($articles as $article)
-                <li>
-                    <a href="{{ route('article.picshow', $article) }}">
-                        <div class="proimg"><img src="{{ $article->one_picture_path }}" /></div>
-                        <p class="ccsl">{{ $article->title }}</p>
-                    </a>
-                </li>
-                @endforeach
-            </ul>
-            <div class="clear"></div>
-            {{ $articles->links() }}
-        </div>
-        <div class="clear"></div>
-    </div>
-</div>
-<div class="clear"></div>
-@endsection
--- a/resources/views/articles/search.blade.php
+++ b/resources/views/articles/search.blade.php
@@ -0,0 +1,38 @@
+@extends('layouts.app')
+
+@section('title', '搜索结果')
+
+
+@section('content')
+    <!-- content -->
+    <div class="container mian">
+        <div class="mian-content-header">
+            <a href="#">首页</a>
+            <i class="fa fa-caret-right"></i>
+            <a href="#">搜索结果</a>
+        </div>
+        <!-- 文章列表 -->
+        <ul class="results-news-ul">
+
+            @if ($articles->isNotEmpty())
+                @foreach ($articles as $article)
+                    <li>
+                        <a class="nowrap" href="{{ $article->link }}">
+                            <i class="fa fa-angle-double-right"></i>
+                            {{ $article->title }}
+                            <span>{{ $article->created_at->format('Y-m-d') }}</span>
+                        </a>
+                    </li>
+                @endforeach
+            @endif
+
+        </ul>
+        <!-- 分页 -->
+        <div class="pages">
+            @if ($articles->isNotEmpty())
+                {{ $articles->links('layouts.pagination') }}
+            @endif
+        </div>
+    </div>
+    <!-- end content -->
+@endsection
--- a/resources/views/articles/show.blade.php
+++ b/resources/views/articles/show.blade.php
@@ -1,31 +1,26 @@
@extends('layouts.app')

-@section('title', '详情')
+@section('title', $article->title)

-@section('keywords', $article->keywords)
-@section('description', $article->description)

@section('content')
-<div class="mabody">
-<div class="mainWarp">
-  @include('layouts.left')
-  <div class="mainRight">
-    <div class="brandnavbox">
-       <p class="ccsl">{{ $article->category->title }}</p>
-       <div class="con ccsl">首页 > {{ $article->category->title }} ></div>
-    </div>
-    <div class="detailbox">
-      <div class="xq">
-        <h1>{{ $article->title }}</h1>
-        <div class="date">发布时间：{{ $article->created_at->format('Y-m-d') }}</div>
-        <div class="con">
+    <!-- content -->
+    <div class="container details">
+        <!-- 文章标题 -->
+        <h3 class="details-title">{{ $article->title }}</h3>
+        <p class="details-time">{{ $article->created_at }}</p>
+        <!-- 文章详情 -->
+        <div class="details-content">
+            <img src="{{ $article->cover_path }}">
+
            {!!  $article->content !!}
        </div>
+        <!-- 下一篇 -->
+        @if ($next)
+            <div class="details-writings">
+
+                <a href="{{ $next->link }}">下一篇：{{ $next->title }}</a>
            </div>
+        @endif
    </div>
-  </div>
-  <div class="clear"></div>
-</div>
-</div>
-<div class="clear"></div>
@endsection
--- a/resources/views/category/cgzh.blade.php
+++ b/resources/views/category/cgzh.blade.php
@@ -0,0 +1,80 @@
+@extends('layouts.app')
+
+@section('title', $category->title)
+
+@section('content')
+    <!-- content -->
+    <div class="container mian">
+        <!-- content-nav -->
+        <nav class="mian-nav">
+            @include('category.left',$parent)
+        </nav>
+        <!-- content-content -->
+        <div class="mian-content">
+            <div class="mian-content-header">
+                <a href="/">首页</a>
+                <i class="fa fa-caret-right"></i>
+                <a href="{{ $category->link }}">{{ $category->title }}</a>
+            </div>
+            <!-- 创新成果转移转化亮点工作 -->
+            <div class="sub-title">
+                <b><i class="fa fa-certificate"></i>{{ getOneCategory(20,'title') }}</b>
+                <a href="{{ getOneCategory(20,'link') }}">更多</a>
+            </div>
+            <div class="results-news">
+                @if(getArticlesBYCate(20,8)->isNotEmpty())
+                    @foreach (getArticlesBYCate(20,8) as $article)
+                        @if ($loop->first)
+                            <a class="results-news-cover" style="background-image: url({{ $article->cover_path }});" href="{{ $article->link }}">
+                                <span>{{ $article->title }}</span>
+                            </a>
+                        @endif
+                    @endforeach
+                    <ul class="results-news-ul">
+                        @foreach (getArticlesBYCate(20,8) as $article)
+                            @if ($loop->iteration>1)
+                                <li>
+                                    <a class="nowrap" href="{{ $article->link }}">
+                                        <i class="fa fa-angle-double-right"></i>
+                                        {{ $article->title }}
+                                        <span>{{ $article->created_at }}</span>
+                                    </a>
+                                </li>
+                            @endif
+                        @endforeach
+                    </ul>
+                @endif
+            </div>
+            <!-- 工作动态 -->
+            <div class="sub-title">
+                <b><i class="fa fa-th-large"></i>{{ getOneCategory(21,'title') }}</b>
+                <a href="{{ getOneCategory(21,'link') }}">更多</a>
+            </div>
+            <div class="results-news">
+                @if(getArticlesBYCate(21,8)->isNotEmpty())
+                    @foreach (getArticlesBYCate(21,8) as $article)
+                        @if ($loop->first)
+                            <a class="results-news-cover" style="background-image: url({{ $article->cover_path }});" href="{{ $article->link }}">
+                                <span>{{ $article->title }}</span>
+                            </a>
+                        @endif
+                    @endforeach
+                    <ul class="results-news-ul">
+                        @foreach (getArticlesBYCate(21,8) as $article)
+                            @if ($loop->iteration>1)
+                                <li>
+                                    <a class="nowrap" href="{{ $article->link }}">
+                                        <i class="fa fa-angle-double-right"></i>
+                                        {{ $article->title }}
+                                        <span>{{ $article->created_at }}</span>
+                                    </a>
+                                </li>
+                            @endif
+                        @endforeach
+                    </ul>
+                @endif
+            </div>
+        </div>
+    </div>
+    <!-- end content -->
+@endsection
--- a/resources/views/category/djkxwh.blade.php
+++ b/resources/views/category/djkxwh.blade.php
@@ -0,0 +1,109 @@
+@extends('layouts.app')
+
+@section('title', $category->title)
+
+@section('content')
+    <!-- content -->
+    <div class="container mian">
+        <!-- content-nav -->
+        <nav class="mian-nav">
+            @include('category.left',$parent)
+        </nav>
+        <!-- content-content -->
+        <div class="mian-content">
+            <div class="mian-content-header">
+                <a href="#">首页</a>
+                <i class="fa fa-caret-right"></i>
+                <a href="{{ $category->link }}">{{ $category->title }}</a>
+            </div>
+            <!-- 工作动态 -->
+            <div class="sub-title">
+                <b><i class="fa fa-th-large"></i>{{ getOneCategory(32,'title') }}</b>
+                <a href="{{ getOneCategory(32,'link') }}">更多</a>
+            </div>
+            <div class="results-news">
+                @if(getArticlesBYCate(32,8)->isNotEmpty())
+                    @foreach (getArticlesBYCate(32,8) as $article)
+                        @if ($loop->first)
+                            <a class="results-news-cover" style="background-image: url({{ $article->cover_path }});" href="{{ $article->link }}">
+                                <span>{{ $article->title }}</span>
+                            </a>
+                        @endif
+                    @endforeach
+                    <ul class="results-news-ul">
+                        @foreach (getArticlesBYCate(32,8) as $article)
+                            @if ($loop->iteration>1)
+                                <li>
+                                    <a class="nowrap" href="{{ $article->link }}">
+                                        <i class="fa fa-angle-double-right"></i>
+                                        {{ $article->title }}
+                                        <span>{{ $article->created_at->format('Y-m-d') }}</span>
+                                    </a>
+                                </li>
+                            @endif
+                        @endforeach
+                    </ul>
+                @endif
+            </div>
+            <!-- 党风廉政 -->
+            <div class="sub-title">
+                <b><i class="fa fa-th-large"></i>{{ getOneCategory(33,'title') }}</b>
+                <a href="{{ getOneCategory(33,'link') }}">更多</a>
+            </div>
+            <div class="results-news">
+                @if(getArticlesBYCate(33,8)->isNotEmpty())
+                    @foreach (getArticlesBYCate(33,8) as $article)
+                        @if ($loop->first)
+                            <a class="results-news-cover" style="background-image: url({{ $article->cover_path }});" href="{{ $article->link }}">
+                                <span>{{ $article->title }}</span>
+                            </a>
+                        @endif
+                    @endforeach
+                    <ul class="results-news-ul">
+                        @foreach (getArticlesBYCate(33,8) as $article)
+                            @if ($loop->iteration>1)
+                                <li>
+                                    <a class="nowrap" href="{{ $article->link }}">
+                                        <i class="fa fa-angle-double-right"></i>
+                                        {{ $article->title }}
+                                        <span>{{ $article->created_at->format('Y-m-d') }}</span>
+                                    </a>
+                                </li>
+                            @endif
+                        @endforeach
+                    </ul>
+                @endif
+            </div>
+            <!-- 精神文明 -->
+            <div class="sub-title">
+                <b><i class="fa fa-th-large"></i>{{ getOneCategory(34,'title') }}</b>
+                <a href="{{ getOneCategory(34,'link') }}">更多</a>
+            </div>
+            <div class="results-news">
+                @if(getArticlesBYCate(34,8)->isNotEmpty())
+                    @foreach (getArticlesBYCate(34,8) as $article)
+                        @if ($loop->first)
+                            <a class="results-news-cover" style="background-image: url({{ $article->cover_path }});" href="{{ $article->link }}">
+                                <span>{{ $article->title }}</span>
+                            </a>
+                        @endif
+                    @endforeach
+                    <ul class="results-news-ul">
+                        @foreach (getArticlesBYCate(34,8) as $article)
+                            @if ($loop->iteration>1)
+                                <li>
+                                    <a class="nowrap" href="{{ $article->link }}">
+                                        <i class="fa fa-angle-double-right"></i>
+                                        {{ $article->title }}
+                                        <span>{{ $article->created_at->format('Y-m-d') }}</span>
+                                    </a>
+                                </li>
+                            @endif
+                        @endforeach
+                    </ul>
+                @endif
+            </div>
+        </div>
+    </div>
+    <!-- end content -->
+@endsection
--- a/resources/views/category/kxyj.blade.php
+++ b/resources/views/category/kxyj.blade.php
@@ -0,0 +1,193 @@
+@extends('layouts.app')
+
+@section('title', $category->title)
+
+@section('content')
+    <!-- content -->
+    <div class="container mian">
+        <!-- content-nav -->
+        <nav class="mian-nav">
+            @include('category.left',$parent)
+        </nav>
+        <!-- content-content -->
+        <div class="mian-content">
+            <div class="mian-content-header">
+                <a href="/">首页</a>
+                <i class="fa fa-caret-right"></i>
+                <a href="{{ $category->link }}">{{ $category->title }}</a>
+            </div>
+        {{--            <!-- 创新单元 -->--}}
+        {{--            <div class="sub-title">--}}
+        {{--                <b><i class="fa fa-cloud-upload"></i>{{ getOneCategory(11,'title') }}</b>--}}
+        {{--                <a href="{{ getOneCategory(11,'link') }}">更多</a>--}}
+        {{--            </div>--}}
+        {{--            <div class="results-news">--}}
+        {{--                @if(getArticlesBYCate(11,8)->isNotEmpty())--}}
+        {{--                    @foreach (getArticlesBYCate(11,8) as $article)--}}
+        {{--                        @if ($loop->first)--}}
+        {{--                            <a class="results-news-cover" style="background-image: url({{ $article->cover_path }});" href="{{ $article->link }}">--}}
+        {{--                                <span>{{ $article->title }}</span>--}}
+        {{--                            </a>--}}
+        {{--                        @endif--}}
+        {{--                    @endforeach--}}
+        {{--                    <ul class="results-news-ul">--}}
+        {{--                        @foreach (getArticlesBYCate(11,8) as $article)--}}
+        {{--                            @if ($loop->iteration>1)--}}
+        {{--                                <li>--}}
+        {{--                                    <a class="nowrap" href="{{ $article->link }}">--}}
+        {{--                                        <i class="fa fa-angle-double-right"></i>--}}
+        {{--                                        {{ $article->title }}--}}
+        {{--                                        <span>{{ $article->created_at }}</span>--}}
+        {{--                                    </a>--}}
+        {{--                                </li>--}}
+        {{--                            @endif--}}
+        {{--                        @endforeach--}}
+        {{--                    </ul>--}}
+        {{--                @endif--}}
+        {{--            </div>--}}
+        <!-- 科技奖励 -->
+            <div class="sub-title">
+                <b><i class="fa fa-flag"></i>{{ getOneCategory(13,'title') }}</b>
+                <a href="{{ getOneCategory(13,'link') }}">更多</a>
+            </div>
+            <ul class="research-award-ul">
+                @foreach (getArticlesBYCate(13,3) as $article)
+                    <li data-href="{{ $article->link }}">
+                        <span class="research-award-cover" style="background-image: url({{ $article->cover_path }});"></span>
+                        <h3 class="research-award-title nowrap" data-herf="{{ $article->link }}">{{ $article->title }}</h3>
+                    </li>
+                @endforeach
+            </ul>
+            <!-- 科研产出 -->
+            <div class="sub-title">
+                <b><i class="fa fa-flask"></i>{{ getOneCategory(12,'title') }}</b>
+            </div>
+            <ul class="kycc-border">
+                <li>
+                    <div class="lw lw-lg">
+                        <div class="lw-left lw-left-lg">论</br>文</div>
+                        <ul class="lw-center">
+                            @if(getPatent(8,'paper')->isNotEmpty())
+                                @foreach (getPatent(8,'paper') as $paper)
+                                    <li class="nowrap">
+                                        <a href="{{ $paper->link }}">{{ $paper->title }}</a>
+                                    </li>
+                                @endforeach
+                            @endif
+                        </ul>
+                    </div>
+                </li>
+                <li>
+                    <div class="lw lw-lg">
+                        <div class="lw-left lw-left-lg">专</br>利</div>
+                        <ul class="lw-center">
+                            @if(getPatent(8,'patent')->isNotEmpty())
+                                @foreach (getPatent(8,'patent') as $patent)
+                                    <li class="nowrap">
+                                        <a href="{{ $patent->link }}">{{ $patent->title }}</a>
+                                    </li>
+                                @endforeach
+                            @endif
+                        </ul>
+                    </div>
+                </li>
+            </ul>
+            {{--            <!-- 科研进展 -->--}}
+            {{--            <div class="sub-title">--}}
+            {{--                <b><i class="fa fa-hourglass-end"></i>科研进展</b>--}}
+            {{--                <a href="#">更多</a>--}}
+            {{--            </div>--}}
+            {{--            <div class="research-evolve">--}}
+            {{--                <ul class="results-news-ul research-evolve-item">--}}
+            {{--                    <li>--}}
+            {{--                        <a class="nowrap" href="#">--}}
+            {{--                            <i class="fa fa-angle-double-right"></i>--}}
+            {{--                            长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展--}}
+            {{--                            <span>2020-09-03</span>--}}
+            {{--                        </a>--}}
+            {{--                    </li>--}}
+            {{--                    <li>--}}
+            {{--                        <a class="nowrap" href="#">--}}
+            {{--                            <i class="fa fa-angle-double-right"></i>--}}
+            {{--                            长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展--}}
+            {{--                            <span>2020-09-03</span>--}}
+            {{--                        </a>--}}
+            {{--                    </li>--}}
+            {{--                    <li>--}}
+            {{--                        <a class="nowrap" href="#">--}}
+            {{--                            <i class="fa fa-angle-double-right"></i>--}}
+            {{--                            长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展--}}
+            {{--                            <span>2020-09-03</span>--}}
+            {{--                        </a>--}}
+            {{--                    </li>--}}
+            {{--                    <li>--}}
+            {{--                        <a class="nowrap" href="#">--}}
+            {{--                            <i class="fa fa-angle-double-right"></i>--}}
+            {{--                            长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展--}}
+            {{--                            <span>2020-09-03</span>--}}
+            {{--                        </a>--}}
+            {{--                    </li>--}}
+            {{--                    <li>--}}
+            {{--                        <a class="nowrap" href="#">--}}
+            {{--                            <i class="fa fa-angle-double-right"></i>--}}
+            {{--                            长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展--}}
+            {{--                            <span>2020-09-03</span>--}}
+            {{--                        </a>--}}
+            {{--                    </li>--}}
+            {{--                    <li>--}}
+            {{--                        <a class="nowrap" href="#">--}}
+            {{--                            <i class="fa fa-angle-double-right"></i>--}}
+            {{--                            长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展长春应化所等在新型半导体激光器研究中取得进展--}}
+            {{--                            <span>2020-09-03</span>--}}
+            {{--                        </a>--}}
+            {{--                    </li>--}}
+            {{--                </ul>--}}
+            {{--                <ul class="results-news-ul research-evolve-item">--}}
+            {{--                    <li>--}}
+            {{--                        <a class="nowrap" href="#">--}}
+            {{--                            <i class="fa fa-angle-double-right"></i>--}}
+            {{--                            长春应化所等在新型半导体激光器研究中取得进展--}}
+            {{--                            <span>2020-09-03</span>--}}
+            {{--                        </a>--}}
+            {{--                    </li>--}}
+            {{--                    <li>--}}
+            {{--                        <a class="nowrap" href="#">--}}
+            {{--                            <i class="fa fa-angle-double-right"></i>--}}
+            {{--                            长春应化所等在新型半导体激光器研究中取得进展--}}
+            {{--                            <span>2020-09-03</span>--}}
+            {{--                        </a>--}}
+            {{--                    </li>--}}
+            {{--                    <li>--}}
+            {{--                        <a class="nowrap" href="#">--}}
+            {{--                            <i class="fa fa-angle-double-right"></i>--}}
+            {{--                            长春应化所等在新型半导体激光器研究中取得进展--}}
+            {{--                            <span>2020-09-03</span>--}}
+            {{--                        </a>--}}
+            {{--                    </li>--}}
+            {{--                    <li>--}}
+            {{--                        <a class="nowrap" href="#">--}}
+            {{--                            <i class="fa fa-angle-double-right"></i>--}}
+            {{--                            长春应化所等在新型半导体激光器研究中取得进展--}}
+            {{--                            <span>2020-09-03</span>--}}
+            {{--                        </a>--}}
+            {{--                    </li>--}}
+            {{--                    <li>--}}
+            {{--                        <a class="nowrap" href="#">--}}
+            {{--                            <i class="fa fa-angle-double-right"></i>--}}
+            {{--                            长春应化所等在新型半导体激光器研究中取得进展--}}
+            {{--                            <span>2020-09-03</span>--}}
+            {{--                        </a>--}}
+            {{--                    </li>--}}
+            {{--                    <li>--}}
+            {{--                        <a class="nowrap" href="#">--}}
+            {{--                            <i class="fa fa-angle-double-right"></i>--}}
+            {{--                            长春应化所等在新型半导体激光器研究中取得进展--}}
+            {{--                            <span>2020-09-03</span>--}}
+            {{--                        </a>--}}
+            {{--                    </li>--}}
+            {{--                </ul>--}}
+            {{--            </div>--}}
+        </div>
+    </div>
+    <!-- end content -->
+@endsection
--- a/resources/views/category/left.blade.php
+++ b/resources/views/category/left.blade.php
@@ -0,0 +1,12 @@
+@if($parent->cover_path)
+    <img class="mian-nav-cover" src="{{ $parent->cover_path }}" alt="导航封面">
+@endif
+<ul class="mian-nav-ul">
+    @if ($category->children->isNotEmpty())
+        @foreach ($category->children as $children)
+            <li class="show">
+                <a href="{{ $children->link }}">{{ $children->title }}</a>
+            </li>
+        @endforeach
+    @endif
+</ul>
--- a/resources/views/category/list.blade.php
+++ b/resources/views/category/list.blade.php
@@ -0,0 +1,63 @@
+@extends('layouts.app')
+
+@section('title', $category->title)
+
+@section('content')
+    <!-- content -->
+    <div class="container mian">
+        <!-- content-nav -->
+        <nav class="mian-nav">
+            @if($parent->cover_path)
+                <img class="mian-nav-cover" src="{{ $parent->cover_path }}" alt="导航封面">
+            @endif
+            <ul class="mian-nav-ul">
+                @if ($parent->children->isNotEmpty())
+                    @foreach ($parent->children as $children)
+                        <li class="show">
+                            <a href="{{ $children->link }}">{{ $children->title }}</a>
+                        </li>
+                    @endforeach
+                @endif
+            </ul>
+        </nav>
+        <!-- content-content -->
+        <div class="mian-content">
+            <div class="mian-content-header">
+                <a href="#">首页</a>
+                <i class="fa fa-caret-right"></i>
+                <a href="{{ $category->link }}">{{ $category->title }}</a>
+            </div>
+            <!-- 文章列表 -->
+            <ul class="results-news-ul">
+                @if ($articles->isNotEmpty())
+                    @foreach ($articles as $article)
+                        <li>
+                            <a class="nowrap" href="{{ $article->link }}">
+                                <i class="fa fa-angle-double-right"></i>
+                                {{ $article->title }}
+                                <span>{{ $article->created_at->format('Y-m-d') }}</span>
+                            </a>
+                        </li>
+                    @endforeach
+                @endif
+
+            </ul>
+        </div>
+        <!-- 分页 -->
+        <div class="pages">
+            @if ($articles->isNotEmpty())
+                {{ $articles->links('layouts.pagination') }}
+            @endif
+            {{--            <a href="#">上一页</a>--}}
+            {{--            <a href="#" class="show">1</a>--}}
+            {{--            <a href="#">2</a>--}}
+            {{--            <a href="#">3</a>--}}
+            {{--            <a href="#">4</a>--}}
+            {{--            <a href="#">5</a>--}}
+            {{--            <a href="#">...</a>--}}
+            {{--            <a href="#">10</a>--}}
+            {{--            <a href="#">下一页</a>--}}
+        </div>
+    </div>
+    <!-- end content -->
+@endsection
--- a/resources/views/category/rcdw.blade.php
+++ b/resources/views/category/rcdw.blade.php
@@ -0,0 +1,136 @@
+@extends('layouts.app')
+
+@section('title', $category->title)
+
+@section('content')
+    <!-- content -->
+    <div class="container mian">
+        <!-- content-nav -->
+        <nav class="mian-nav">
+            @include('category.left',$parent)
+        </nav>
+        <!-- content-content -->
+        <div class="mian-content">
+            <div class="mian-content-header">
+                <a href="#">首页</a>
+                <i class="fa fa-caret-right"></i>
+                <a href="{{ $category->link }}">{{ $category->title }}</a>
+            </div>
+            <!-- 高级职称专家 -->
+            <div class="sub-title">
+                <b><i class="fa fa-users"></i>{{ getOneCategory(29,'title') }}</b>
+            </div>
+            <ul class="rcdw">
+                @if (getArticlesBYCate(29,16)->isNotEmpty())
+                    @foreach (getArticlesBYCate(29,16) as $article)
+                        <li class="rcdw-xh" data-href="{{  $article->link }}">
+                            <span class="rcdw-cover" style="background-image: url({{ $article->cover_path }});"></span>
+                            <div class="rcdw-xxh">
+                                <h3>{{ $article->title }}</h3>
+                                <p>{{ $article->job }}</p>
+                            </div>
+                        </li>
+                    @endforeach
+                @endif
+            </ul>
+            <!-- 省级领军人才梯队 -->
+            <div class="sub-title">
+                <b><i class="fa fa-line-chart"></i>{{ getOneCategory(30,'title') }}</b>
+            </div>
+            <div class="rctd-boeder">
+                <div class="rctd2" style="background-image: url(/assets/index/img/ad_01.jpeg);"></div>
+                <p class="rctd3-p">
+                    <span>梯队名称：</span>
+                    <span>控制科学与技术（共20人）</span>
+                </p>
+                <p class="rctd3-p">
+                    <span>带头人：</span>
+                    <span>吴冈</span>
+                </p>
+                <p class="rctd3-p">
+                    <span>后备带头人：</span>
+                    <span>何艳</span>
+                </p>
+                <p class="rctd3-p">
+                    <span>梯队成员：</span>
+                    <span>骆南</span>
+                    <span>吕汉</span>
+                    <span>张文焱</span>
+                    <span>郝明</span>
+                    <span>石磊</span>
+                    <span>孙凯明</span>
+                    <span>宋昌江</span>
+                    <span>丛晓丹</span>
+                    <span>杨东亮</span>
+                    <span>杨洋</span>
+                    <span>费磊</span>
+                    <span>高凤娇</span>
+                    <span>朱国强</span>
+                    <span>王刚</span>
+                    <span>杨庆禹</span>
+                    <span>李昕迪</span>
+                    <span>王云龙</span>
+                    <span>曹灿</span>
+                </p>
+                <p class="rctd3-p">
+                    <span>研究方向：</span>
+                    <span>智能控制理论及现代测控技术</span>
+                    <span>基于各种技术融合的专家推理系统和预测分析系统及50G建模</span>
+                    <span>基于计算机的视觉技术的非接触三维测量和识别技术</span>
+                </p>
+            </div>
+            <div class="rctd-boeder ">
+                <div class="rctd2" style="background-image: url(/assets/index/img/ad_01.jpeg);"></div>
+                <p class="rctd3-p">
+                    <span>梯队名称：</span>
+                    <span>计算机决策支持系统（共28+1人）</span>
+                </p>
+                <p class="rctd3-p">
+                    <span>带头人：</span>
+                    <span>刘彤军</span>
+                </p>
+                <p class="rctd3-p">
+                    <span>后备带头人：</span>
+                    <span>李中伟</span>
+                </p>
+                <p class="rctd3-p">
+                    <span>梯队成员：</span>
+                    <span>朱明清</span>
+                    <span>巩伟</span>
+                    <span>邓广龙</span>
+                    <span>田晓英</span>
+                    <span>田力</span>
+                    <span>宋永江</span>
+                    <span>周晓宇</span>
+                    <span>张小平</span>
+                    <span>李金波</span>
+                    <span>牛健</span>
+                    <span>王涛</span>
+                    <span>周丽丽</span>
+                    <span>杨喆</span>
+                    <span>王金玉</span>
+                    <span>张宇</span>
+                    <span>李长武</span>
+                    <span>钱冠华</span>
+                    <span>吕宜光</span>
+                    <span>孙永欣</span>
+                    <span>张迁礼</span>
+                    <span>林立鑫</span>
+                    <span>张博文</span>
+                    <span>李喜东</span>
+                    <span>甄海涛</span>
+                    <span>张建平</span>
+                    <span>杨卓林</span>
+                    <span>陈庆文</span>
+                </p>
+                <p class="rctd3-p">
+                    <span>研究方向：</span>
+                    <span>智能控制理论及现代测控技术</span>
+                    <span>基于各种技术融合的专家推理系统和预测分析系统及50G建模</span>
+                    <span>基于计算机的视觉技术的非接触三维测量和识别技术</span>
+                </p>
+            </div>
+        </div>
+    </div>
+    <!-- end content -->
+@endsection
--- a/resources/views/category/zzjg.blade.php
+++ b/resources/views/category/zzjg.blade.php
@@ -0,0 +1,99 @@
+@extends('layouts.app')
+
+@section('title', $category->title)
+
+@section('content')
+    <!-- content -->
+    <div class="container mian">
+        <!-- content-nav -->
+        <nav class="mian-nav">
+            @include('category.left',$parent)
+        </nav>
+        <!-- content-content -->
+        <div class="mian-content">
+            <div class="mian-content-header">
+                <a href="#">首页</a>
+                <i class="fa fa-caret-right"></i>
+                <a href="{{ $category->link }}">{{ $category->title }}</a>
+            </div>
+            <!-- 研究所简介 -->
+            <div class="sub-title">
+                <b><i class="fa fa-book"></i>{{ getOneCategory(2,'title') }}</b>
+            </div>
+            <div class="org-intro">
+                <div class="org-intro-cover" style="background-image: url({{ getOneArticleBYCate(2)->cover_path }});"></div>
+                <div class="org-intro-text">
+                    {{ getOneArticleBYCate(2)->description }}
+                </div>
+                <div class="org-intro-more">
+                    <a href="{{ getOneArticleBYCate(2,'link') }}">查看更多</a>
+                </div>
+            </div>
+            <!-- 领导班子 -->
+            <div class="sub-title">
+                <b><i class="fa fa-users"></i>{{ getOneCategory(3,'title') }}</b>
+            </div>
+            <ul class="org-lead-ul">
+                @if (getArticlesBYCate(3,6)->isNotEmpty())
+                    @foreach (getArticlesBYCate(3,6) as $article)
+                        <li>
+                            <span class="org-lead-cover" style="background-image: url({{ $article->cover_path }});"></span>
+                            <a class="org-lead-name" href="{{ $article->link }}">{{ $article->title }}</a>
+                            <p class="org-lead-job">{{ $article->job }}</p>
+                            <p class="org-lead-job"> {{ $article->working }}</p>
+                        </li>
+                    @endforeach
+                @endif
+
+            </ul>
+            <!-- 机构设置 -->
+            <div class="sub-title">
+                <b><i class="fa fa-tasks"></i>{{ getOneCategory(4,'title') }}</b>
+            </div>
+            <div class="org-inst">
+                <span data-href="{{ getOneCategory(5,'link') }}"><i class="fa fa-chevron-circle-right"></i>{{ getOneCategory(5,'title') }}</span>
+                <span data-href="{{ getOneCategory(6,'link') }}"><i class="fa fa-chevron-circle-right"></i>{{ getOneCategory(6,'title') }}</span>
+                <span data-href="{{ getOneCategory(7,'link') }}"><i class="fa fa-chevron-circle-right"></i>{{ getOneCategory(7,'title') }}</span>
+                <span data-href="{{ getOneCategory(8,'link') }}"><i class="fa fa-chevron-circle-right"></i>{{ getOneCategory(8,'title') }}</span>
+                <span data-href="{{ getOneCategory(9,'link') }}"><i class="fa fa-chevron-circle-right"></i>{{ getOneCategory(9,'title') }}</span>
+            </div>
+            <ul class="org-inst-ul">
+                <li>
+                    <span><i class="fa fa-chevron-circle-right"></i>{{ getOneCategory(37,'title') }}</span>
+                    <span><i class="fa fa-chevron-right"></i></span>
+                    @if (getCateChild(37)->isNotEmpty())
+                        @foreach (getCateChild(37) as $child)
+                            <span data-href="{{ $child->link }}">{{ $child->title }}</span>
+                        @endforeach
+                    @endif
+                </li>
+                <li>
+                    <span><i class="fa fa-chevron-circle-right"></i>{{ getOneCategory(38,'title') }}</span>
+                    <span><i class="fa fa-chevron-right"></i></span>
+                    @if (getCateChild(38)->isNotEmpty())
+                        @foreach (getCateChild(38) as $child)
+                            <span data-href="{{ $child->link }}">{{ $child->title }}</span>
+                        @endforeach
+                    @endif
+                </li>
+                <li>
+                    <span data-href="{{ getOneCategory(39,'link') }}"><i class="fa fa-chevron-circle-right"></i>{{ getOneCategory(39,'title') }}</span>
+                </li>
+            </ul>
+            <!-- 历史沿革 -->
+            <div class="sub-title">
+                <b><i class="fa fa-clock-o"></i>{{ getOneCategory(50,'title') }}</b>
+            </div>
+            <div class="org-history">
+                <div class="org-history-cover" style="background-image: url({{ getOneArticleBYCate(50,'cover_path') }});"></div>
+                <div class="org-intro-text">
+                    {{ getOneArticleBYCate(50,'description') }}
+                </div>
+                <div class="org-intro-more">
+                    <a href="{{ getOneArticleBYCate(50,'link') }}">查看更多</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- end content -->
+@endsection
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -3,318 +3,213 @@
@section('title', '首页')

@section('content')
-
-<!-- 随手拍+最新资讯 -->
-<div class="ce-white ui-margin-b">
-    <div class="contant">
-        <div class="idxShoot">
-            <div class="idxShoot-title">
-                <p>随手拍</p>
-                <span>/ BEAT</span>
+    <!-- special -->
+    <div class="container special-content">
+        <a href="{{ getOneArticleBYCate(35,'link') }}">{{ getOneArticleBYCate(35,'title') }}</a>
    </div>
-            <div class="idxShoot-swiper">
-                <!-- Swiper -->
-                <div class="swiper-container gallery-top">
+    <!-- end special -->
+    <!-- banner -->
+    <div class="swiper-container" id="swiperBanner">
        <div class="swiper-wrapper">
-                        @foreach ($ssp as $element)
-                        @foreach ($element->pictures as $picture)
-                        <div class="swiper-slide" style="background-image:url({{ Storage::disk('public')->url($picture ) }})"></div>
-                        @endforeach
-                        @endforeach
-                    </div>
-                    <!-- Add Arrows -->
-                </div>
-                <div class="swiper-container gallery-thumbs">
-                    <div class="swiper-wrapper">
-                        @foreach ($ssp as $element)
-                        @foreach ($element->pictures as $picture)
-                        <div class="swiper-slide" style="background-image:url({{ Storage::disk('public')->url($picture ) }})"></div>
-                        @endforeach
-                        @endforeach
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="idxNews">
-            <div class="idxShoot-title">
-                <p>最新资讯</p>
-                <span>/ NEW</span>
-            </div>
-            <ul class="idxNews-ul">
-                @foreach ($all_articles as $article)
-                <li>
-                    <div class="idxNews-ul-title">
-                        <a href="{{ route('article.show', $article) }}"><p class="ce-nowrap">{{ $article->title }}</p></a>
-                        <span>{{ $article->created_at }}</span>
-                    </div>
-                    <div class="ce-nowrap-multi idxNews-ul-text">
-                        {{ $article->description }}
-                    </div>
-                </li>
-                @endforeach
-            </ul>
-        </div>
-    </div>
-</div>
-
-<!-- 单位概况 -->
-<div class="contant idxSurvey">
-    <div class="idxShoot-title">
-        <div class="idxShoot-title-name">
-            <p>期刊简介</p>
-            <span>/ INTRODUCTION OF THE JOURNAL</span>
-        </div>
-        <a href="@if ($danwei)            {{ route('article.show', $danwei) }}        @endif">更多 &gt;</a>
-    </div>
-    <div class="idxSurveyCont">
-        <div class="idxSurveyCont-left">
-            @if ($danwei)            {{ $danwei->description }}        @endif
-
-        </div>
-        <div class="idxSurveyCont-right">
-            <div class="idxSurveyCont-right-img">
-                <img src=" @if ($danwei)           {{ $danwei->cover_path }}        @endif">
-            </div>
-        </div>
-    </div>
-</div>
-
-<!-- 养生保健 -->
-<div class="ce-white ui-margin-t">
-    <div class="contant">
-        <div class="idxShoot-title">
-            <p>养生保健</p>
-            <span>/ HEALTH CARE</span>
-        </div>
-        <ul class="idxHealthUl">
-            @foreach ($ysbj as $article)
-            <li>
-                <div class="ce-img idxHealthUl-img">
-                    <span style="background-image: url( {{ $article->cover_path }} );"></span>
-                </div>
-                <div class="idxHealthUl-text">
-                    <div class="idxHealthUl-title">{{ $article->title }}</div>
-                    <div class="idxHealthUl-tips">
-                        {{ $article->description }}
-                    </div>
-                    <a href="{{ route('article.show', $article) }}">
-                        <div class="idxHealthUl-btn">
-                            MORE
-                        </div>
+            @if ($center_advert->isNotEmpty())
+                @foreach ($center_advert as $advert)
+                    <div class="swiper-slide">
+                        <a class="swiper-banner-img" style="background-image: url({{ $advert->cover_path }});" href="@if($advert->url) {{ $advert->url }} @endif">
+                            <h3>{{ $advert->title }}</h3>
                        </a>
                    </div>
-            </li>
                @endforeach
-
-        </ul>
+            @endif
        </div>
+        <div class="swiper-pagination"></div>
+        <div class="swiper-button-prev"></div>
+        <div class="swiper-button-next"></div>
    </div>
-
-<!-- 广告位 -->
-<div class="idxPoster" style="background-image: url({{ $center_advert->cover_path }});"></div>
-
-<!-- 精彩推介 -->
-<div class="ce-white" style="padding: 30px 0 50px">
-    <div class="contant">
-        <div class="idxShoot-title">
-            <p>精彩推介</p>
-            <span>/ Wonderful promotion</span>
+    <!-- end banner -->
+    <!-- content -->
+    <div class="container mian">
+        <!-- left -->
+        <div class="index-mian-left">
+            <!-- 院所新闻 -->
+            <div class="index-mian-title">
+                <span><i class="fa fa-newspaper-o"></i>{{ getOneCategory(15,'title') }}</span>
+                <a href="{{ getOneCategory(15,'link') }}">更多<i class="fa fa-plus"></i></a>
            </div>
-        <ul class="recomdUl">
-            <li>
-                <div class="recomdUl-title">
-                    <div class="recomdUl-title-img">
-                        <img src="/assets/index/images/idx/idxIcon_00.png">
-                        <span>调研与分析</span>
+            <div class="index-mian-news">
+                @if ($ysxw->isNotEmpty())
+                    <div class="index-mian-news-hot">
+                        <a href="{{ $ysxw->first()->link }}" class="index-mian-news-cover" style="background-image: url({{ $ysxw->first()->cover_path  }});"></a>
+                        <a href="{{ $ysxw->first()->link }}" class="index-mian-news-href">
+                            <p class="nowrap-multi">{{ $ysxw->first()->title }}</p>
+                            <p class="nowrap">{{ $ysxw->first()->created_at->format('Y-m-d') }}</p>
+                        </a>
                    </div>
-                    <img class="idxIconRow" src="/assets/index/images/idx/idxIcon_row.png">
-                </div>
-                @if ($dcyfx->isNotEmpty())
-
-                <div class="recomdUl-top">
-                    <div class="ce-img recomdUl-top-img">
-                        <span style="background-image: url({{ $dcyfx->first()->cover_path }});"></span>
-                    </div>
-                    <div class="recomdUl-top-text">
-                        <p class="ce-nowrap"><a href="{{ route('article.show', $dcyfx->first()) }}"> {{ $dcyfx->first()->title }}</a></p>
-                        <span class="ce-nowrap-multi">{{ $dcyfx->first()->description }}</span>
-                    </div>
-                </div>
-                <ul class="recomdUl-list">
-                    @foreach ($dcyfx as $article)
+                    <ul class="index-mian-news-ul">
+                        @foreach ($ysxw as $info)
                            @if ($loop->iteration>1)
-                    <li class="ce-nowrap">
-                        <a href="{{ route('article.show', $article) }}">
-                            {{ $article->title }}
+                                <li>
+                                    <a href="{{ $info->link }}" class="nowrap">
+                                        <i class="fa fa-chevron-circle-right"></i>
+                                        {{ $info->title }}
+                                        <span>{{ $info->created_at->format('Y-m-d') }}</span>
                                    </a>
                                </li>
                            @endif
                        @endforeach
                    </ul>
                @endif
-            </li>
-            <li>
-                <div class="recomdUl-title">
-                    <div class="recomdUl-title-img">
-                        <img src="/assets/index/images/idx/idxIcon_01.png">
-                        <span>应用基础研究</span>
-                    </div>
-                    <img class="idxIconRow" src="/assets/index/images/idx/idxIcon_row.png">
-                </div>
-                @if ($yyjcyj->isNotEmpty())

-                <div class="recomdUl-top">
-                    <div class="ce-img recomdUl-top-img">
-                        <span style="background-image: url({{ $yyjcyj->first()->cover_path }});"></span>
            </div>
-                    <div class="recomdUl-top-text">
-                        <p class="ce-nowrap"><a href="{{ route('article.show', $yyjcyj->first()) }}"> {{ $yyjcyj->first()->title }}</a></p>
-                        <span class="ce-nowrap-multi">{{ $yyjcyj->first()->description }}</span>
+            <!-- 科技成果 -->
+            <div class="index-mian-title">
+                <span><i class="fa fa-flask"></i>{{ getOneCategory(20,'title') }}</span>
+                <a href="{{ getOneCategory(20,'link') }}">更多<i class="fa fa-plus"></i></a>
            </div>
+            <div class="index-mian-news">
+                @if ($kjcg->isNotEmpty())
+                    <div class="index-mian-news-hot">
+                        <a href="{{ $kjcg->first()->link }}" class="index-mian-news-cover" style="background-image: url({{ $kjcg->first()->cover_path  }});"></a>
+                        <a href="{{ $kjcg->first()->link }}" class="index-mian-news-href">
+                            <p class="nowrap-multi">{{ $kjcg->first()->title }}</p>
+                            <p class="nowrap">{{ $kjcg->first()->created_at->format('Y-m-d') }}</p>
+                        </a>
                    </div>
-                <ul class="recomdUl-list">
-                    @foreach ($yyjcyj as $article)
+                    <ul class="index-mian-news-ul">
+                        @foreach ($kjcg as $info)
                            @if ($loop->iteration>1)
-                    <li class="ce-nowrap">
-                        <a href="{{ route('article.show', $article) }}">
-                            {{ $article->title }}
+                                <li>
+                                    <a href="{{ $info->link }}" class="nowrap">
+                                        <i class="fa fa-chevron-circle-right"></i>
+                                        {{ $info->title }}
+                                        <span>{{ $info->created_at->format('Y-m-d') }}</span>
                                    </a>
                                </li>
                            @endif
                        @endforeach
                    </ul>
                @endif
-
-            </li>
-            <li>
-                <div class="recomdUl-title">
-                    <div class="recomdUl-title-img">
-                        <img src="/assets/index/images/idx/idxIcon_02.png">
-                        <span>技术研讨</span>
            </div>
-                    <img class="idxIconRow" src="/assets/index/images/idx/idxIcon_row.png">
+            <!-- 论文专利 -->
+            <div class="index-mian-title">
+                <span><i class="fa fa-suitcase"></i>论文专利</span>
+                <a href="{{ route('patents.list') }}">更多<i class="fa fa-plus"></i></a>
            </div>
-                @if ($jsyt->isNotEmpty())
-
-                <div class="recomdUl-top">
-                    <div class="ce-img recomdUl-top-img">
-                        <span style="background-image: url({{ $jsyt->first()->cover_path }});"></span>
+            <div class="index-mian-news">
+                @if ($lwzl->isNotEmpty())
+                    <div class="index-mian-news-hot">
+                        <a href="{{ $lwzl->first()->link }}" class="index-mian-news-cover" style="background-image: url({{ $lwzl->first()->cover_path  }});"></a>
+                        <a href="{{ $lwzl->first()->link }}" class="index-mian-news-href">
+                            <p class="nowrap-multi">{{ $lwzl->first()->title }}</p>
+                            <p class="nowrap">{{ $lwzl->first()->created_at->format('Y-m-d') }}</p>
+                        </a>
                    </div>
-                    <div class="recomdUl-top-text">
-                        <p class="ce-nowrap"><a href="{{ route('article.show', $jsyt->first()) }}"> {{ $jsyt->first()->title }}</a></p>
-                        <span class="ce-nowrap-multi">{{ $jsyt->first()->description }}</span>
-                    </div>
-                </div>
-                <ul class="recomdUl-list">
-                    @foreach ($jsyt as $article)
+                    <ul class="index-mian-news-ul">
+                        @foreach ($lwzl as $info)
                            @if ($loop->iteration>1)
-                    <li class="ce-nowrap">
-                        <a href="{{ route('article.show', $article) }}">
-                            {{ $article->title }}
-                        </a>
-                    </li>
-                    @endif
-                    @endforeach
-                </ul>
-                @endif
-
-            </li>
-        </ul>
-        <ul class="recomdBtom">
                                <li>
-                <div class="recomdUl-title">
-                    <div class="recomdUl-title-img">
-                        <img src="/assets/index/images/idx/idxIcon_03.png">
-                        <span>科研与应用</span>
-                    </div>
-                    <img class="idxIconRow" src="/assets/index/images/idx/idxIcon_row.png">
-                </div>
-                @if ($kyyyy->isNotEmpty())
-
-                <ul class="recomdUl-list">
-                    @foreach ($kyyyy as $article)
-                    <li class="ce-nowrap">
-                        <a href="{{ route('article.show', $article) }}">
-                            {{ $article->title }}
+                                    <a href="{{ $info->link }}" class="nowrap">
+                                        <i class="fa fa-chevron-circle-right"></i>
+                                        {{ $info->title }}
+                                        <span>{{ $info->created_at->format('Y-m-d') }}</span>
                                    </a>
                                </li>
+                            @endif
                        @endforeach
                    </ul>
                @endif
-            </li>
+            </div>
+        </div>
+        <!-- right -->
+        <div class="index-mian-right">
+            <!-- 快速入口 -->
+            @if(!empty($ysxw_right_advert))
+                <a class="index-mian-right-ad index-mian-right-ad-1"
+                   style="background-image: url({{ $ysxw_right_advert->cover_path }} );"
+                   href="{{ $ysxw_right_advert->url }}"
+                >
+                    <span>{{ $ysxw_right_advert->title }}</span>
+                </a>
+        @endif
+
+        <!-- 快速入口 -->
+            <div class="index-mian-right-ads">
+                @if ($kjcg_right_advert->isNotEmpty())
+                    @foreach ($kjcg_right_advert as $advert)
+                        <a class="index-mian-right-ad index-mian-right-ad-5"
+                           style="background-image: url({{ $advert->cover_path }});"
+                           href="{{ $advert->url }}"
+                        >
+                            <span>{{ $advert->title }}</span>
+                        </a>
+                    @endforeach
+                @endif
+            </div>
+            <!-- 学者风采 -->
+            <div class="index-mian-title">
+                <span><i class="fa fa-group"></i>{{ getOneCategory(57,'title') }}</span>
+            </div>
+            <ul class="index-mian-news-ul index-mian-right-ul">
+                @if (getArticlesBYCate(57,4)->isNotEmpty())
+                    @foreach (getArticlesBYCate(57,4) as $article)
                        <li>
-                <div class="recomdUl-title">
-                    <div class="recomdUl-title-img">
-                        <img src="/assets/index/images/idx/idxIcon_03.png">
-                        <span>全科医学</span>
-                    </div>
-                    <img class="idxIconRow" src="/assets/index/images/idx/idxIcon_row.png">
-                </div>
-                @if ($qkys->isNotEmpty())
-
-                <ul class="recomdUl-list">
-                    @foreach ($qkys as $article)
-                    <li class="ce-nowrap">
-                        <a href="{{ route('article.show', $article) }}">
+                            <a href="{{ $article->link }}" class="nowrap">
+                                <i class="fa fa-chevron-circle-right"></i>
                                {{ $article->title }}
                            </a>
                        </li>
                    @endforeach
-                </ul>
                @endif
-            </li>
-        </ul>
-    </div>
-</div>

-@if($qikan_advert->isNotEmpty())
-<!-- 期刊 -->
-<div class="idxWeekly" style="background-image: url(/assets/index/images/idx/idxWeekly_img.png);">
-    <div class="contant">
-        <div class="idxWeekly-title idxShoot-title" style="margin: 0 16px;">
-            <p>期刊</p>
-            <span>/ PERIODICAL</span>
-        </div>
-        <div class="idxWeekly-ul">
-            @foreach ($qikan_advert as $advert)
-            <div class="idxWeekly-back" style="background-image: url({{ $advert->cover_path }});"></div>
-            @endforeach
-        </div>
-    </div>
+            </ul>
+            <!-- 视频新闻 -->
+            <div class="index-mian-title">
+                <span><i class="fa fa-play-circle"></i>{{ getOneCategory(56,'title') }}</span>
            </div>
+            <div class="index-mian-right-video">
+                @if (getArticlesBYCate(56,3)->isNotEmpty())
+                    @foreach (getArticlesBYCate(56,3) as $article)
+                        @if ($loop->last)
+                            <a class="index-mian-right-video-item index-mian-right-video-item-lg"
+                               style="background-image: url({{ $article->cover_path }});"
+                               href="{{ $article->link }}">
+                            </a>
+                        @else
+                            <a class="index-mian-right-video-item" style="background-image: url({{ $article->cover_path }});" href="{{ $article->link }}"></a>
                        @endif
+                    @endforeach
+                @endif
+
+            </div>
+            <!-- 快速入口 -->
+            <div class="index-mian-right-ads">
+                @if ($lwzl_right_advert->isNotEmpty())
+                    @foreach ($lwzl_right_advert as $advert)
+                        <a class="index-mian-right-ad index-mian-right-ad-5"
+                           style="background-image: url({{ $advert->cover_path }});"
+                           href="{{ $advert->url }}"
+                        >
+                            <span>{{ $advert->title }}</span>
+                        </a>
+                    @endforeach
+                @endif
+
+            </div>
+        </div>
+    </div>
@endsection

-
-
@push('script')
-<script>
-    var galleryTop = new Swiper('.gallery-top', {
-        spaceBetween: 10,
-        loop:true
-    });
-    var galleryThumbs = new Swiper('.gallery-thumbs', {
-        spaceBetween: 10,
-        slidesPerView: 3,
-        touchRatio: 0.2,
+    <script type="text/javascript">
+        // swiperBanner
+        var swiperBanner = new Swiper("#swiperBanner", {
+            autoplay: 3000,
+            centeredSlides: true,
            loop: true,
-        slideToClickedSlide: true
-    });
-    galleryTop.params.control = galleryThumbs;
-    galleryThumbs.params.control = galleryTop;
-
-
-// 期刊
-var aswiper = new Swiper('.weekly-container', {
-    pagination: '.swiper-pagination',
-    slidesPerView: 4,
-    paginationClickable: true,
-    spaceBetween: 30,
+            slidesPerView: 'auto',
            nextButton: '.swiper-button-next',
-    prevButton: '.swiper-button-prev'
-});
-
-
+            prevButton: '.swiper-button-prev',
+            pagination: ".swiper-pagination",
+            paginationClickable: true
+        })
    </script>
@endpush
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -1,127 +1,97 @@
-<!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">
+<!DOCTYPE html>
+<html lang="zh-CN">
 <head>
-    <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') }}" />
-    <script type="text/javascript" src="{{ asset('assets/index/js/swiper.min.js') }}"></script>
-    <style type="text/css">
-        body{background: #f4f5f7}
-    </style>
+    <meta charset="utf-8"/>
+    <title>@section('title'){{ config('app.name', '') }}@show</title>
+    <link rel="icon" href="{{ asset('assets/index/img/favicon.ico') }}" mce_href="favicon.ico" type="image/x-icon">
+    <link rel="stylesheet" type="text/css" href="{{ asset('assets/index/css/font-awesome.min.css') }}"/>
+    <link rel="stylesheet" type="text/css" href="{{ asset('assets/index/css/swiper.min.css') }}"/>
+    <link rel="stylesheet" type="text/css" href="{{ asset('assets/index/css/style.css') }}"/>
    @yield('css')
    @yield('js')
 </head>
 <body>
-    <!-- 头部 -->
-    <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') }}">
+<!-- tool -->
+<div class="tool">
+    <div class="container tool-content">
+        <div class="tool-herf">
+            <a href="#">联系我们</a>
+            <span>/</span>
+            <a href="#">网站地图</a>
+            <span>/</span>
+            <a href="#">电子邮箱</a>
        </div>
-        <div class="idxTop-tel">
-            <p>电话：{{ config('mobile') }}</p>
-            <p>邮箱：{{ config('email') }}</p>
+        <form class="tool-search" action="{{ route('article.search') }}">
+            <input name="title" placeholder="输入关键字搜索"/>
+            <button type="submit">
+                <i class="fa fa-search"></i>
+            </button>
+        </form>
    </div>
 </div>
-    <!-- 导航 -->
-    <div class="idxNav">
-        <div class="contant">
-            <div class="idxNav-img">
-                <p>《黑龙江科学》期刊</p>
-                <span>Heilongjiang scientific journals</span>
+<!-- end tool -->
+<!-- header -->
+<header class="header">
+    <div class="container header-content">
+        <img class="header-logo" src="{{ asset('assets/index/img/logo.png') }}" alt="黑龙江省科学院智能制造研究所">
+        <div class="header-text">
+            <p>面向世界科技前沿，面向国家重大需求，面向国民经济主战场，率先实现科学技术跨越发展，率先建成国家创新人才高地，率先建成国家高水平科技智库，率先建设国际一流科研机构。</p>
+            <p class="header-text-sign">——智能制造所办所方针</p>
        </div>
-            <ul class="idxNav-ul">
-                <li   @if (!isset($category)) class="active"  @endif><a href="/">首页</a></li>
+    </div>
+</header>
+<!-- end header -->

-                @foreach($all_categorys as $menu)
-                <li @if (isset($category) && $menu->id==$category->id) class="active"  @endif>
-                    @switch($menu->type)
-                    @case('picture')
-                    <a href="{{ route('article.picture', $menu) }}">
-                        {{ $menu->title }}
-                    </a>
-                    @break
-                    @case('show')
-                    @if ($menu->relations)
-                    <a href="{{ route('article.show', $menu->relations) }}">
-                        {{ $menu->title }}
-                    </a>
-                    @endif
-                    @break
-                    @default
-                    <a href="{{ route('article.index', $menu) }}">
-                        {{ $menu->title }}
-                    </a>
-                    @break
-                    @endswitch
+@include('layouts.header')

-
-                </li>
-                @endforeach
-            </ul>
-        </div>
-    </div>
@section('content')

@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">
-                    <p>《黑龙江科学》期刊</p>
-                    <span>Heilongjiang Science</span>
-                </div>
-                <div class="idxFooter-text">
-                    <div class="idxFooter-title">
-                        <span>编委会</span>
-                        <ul class="idxFooter-ul">
-                            <li>
-                                主&nbsp;&nbsp;&nbsp;任：
-                                @if($manage_users->isNotEmpty()){{ $manage_users->first()->title }} @endif
-                            </li>
-                            <li>
-                                副主任：
-                                @if($manage_users->isNotEmpty())
-                                @foreach ($manage_users as $users)
-                                @if ($loop->iteration>1)
-                                {{ $users->title }}
-                                @endif
-                                @endforeach
-                                @endif
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="idxFooter-name">
-                        <span>专家委员：<small>(以姓氏笔画为序)</small></span>
-                        <ul class="idxFooter-name-ul">
-                            @if ($other_users->isNotEmpty())
-                            @foreach ($other_users as $user)
-                            <li>{{ $user->title }}</li>
-                            @endforeach
-                            @endif
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <ul class="idxFooter-bottom">
+
+@if ($links->isNotEmpty())
+    <!-- href -->
+    <div class="footer-href">
+        <div class="container href-flex">
            @foreach ($links as $link)
-                <li> <a href="{{ $link->url }}">{{ $link->title}}</a> </li>
+                <a href="{{ $link->url }}" target="_Blank">{{ $link->title}}</a>
            @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;总发行：哈尔滨市邮局&nbsp;&nbsp;&nbsp;&nbsp;订阅：全国各地邮局&nbsp;&nbsp;&nbsp;&nbsp;刊期：半月</p>
-                <p>广告发布登记编号：哈南市监逛变字【2019】第21号</p>
        </div>
    </div>
+    <!-- end href -->
+@endif
+<!-- footer -->
+<footer class="footer">
+    <p>版权所有黑龙江省科学院&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;黑ICP备11005256号</p>
+    <p>地址：黑龙江省哈尔滨市南岗区汉水路265号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;邮政编码：150090</p>
+    <p>电话：86-451-82305698&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;eMail：webmaster@haai.com.cn</p>
+    <p>© CopyRight 2002-2012,The Instiute of Automation heilongjiang academy of sciences All rights reserved.</p>
+    <img src="{{ asset('assets/index/img/blue.png') }}" alt="事业单位">
 </footer>
+<!-- end footer -->
+<!-- script -->
+<script src="{{ asset('assets/index/js/jquery.min.js') }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ asset('assets/index/js/swiper.min.js') }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ asset('assets/index/js/cjango.js') }}" type="text/javascript" charset="utf-8"></script>
+<script type="text/javascript">
+
+    // 导航栏
+    $(function () {
+        $("#nav").find("li").mouseenter(function () {
+            if ($(this).find(".nav-layer").length != 0) {
+                $(this).addClass("show");
+                $(this).find(".nav-layer").removeClass('hide');
+            }
+        }).mouseleave(function () {
+            if ($(this).find(".nav-layer").length != 0) {
+                if ($(this).hasClass("show")) {
+                    $(this).removeClass("show");
+                }
+                $(this).find(".nav-layer").addClass('hide');
+            }
+        })
+    })
+</script>
+<!-- end script -->
 </body>
@stack('script')
 </html>
--- a/resources/views/layouts/header.blade.php
+++ b/resources/views/layouts/header.blade.php
@@ -0,0 +1,336 @@
+<!-- nav -->
+<nav class="nav">
+    <div class="container nav-content">
+        <ul class="nav-ul" id="nav">
+            <li class="nav-ul-li @if (!isset($parent)) show @endif">
+                <a href="/">首页</a>
+            </li>
+            <li class="nav-ul-li @if (isset($parent) && $parent->id==config('haai.category.zzjg')) show @endif">
+                <a href=" {{ getOneCategory(config('haai.category.zzjg'),'link') }} ">{{ getOneCategory(config('haai.category.zzjg'),'title') }}</a>
+                <div class="nav-layer hide">
+                    <div class="nav-layer-item nav-org-left">
+                        <!-- 研究所简介 -->
+                        <div class="nav-org-int">
+                            <div class="nav-layer-title">
+                                <span>{{ getOneCategory(2,'title') }}</span>
+                            </div>
+                            <div class="nav-org-mian">
+                                <div class="nav-org-cover">
+                                    <span style="background-image: url({{ getOneArticleBYCate(2)->cover_path }});"></span>
+                                </div>
+                                <p>
+                                    {{ getOneArticleBYCate(2)->description }}
+                                </p>
+                                <p class="nav-org-more"><a href="{{ getOneArticleBYCate(2,'link') }}">查看更多</a></p>
+                            </div>
+                        </div>
+                        <!-- 领导班子 -->
+                        <div class="nav-org-leadership">
+                            <div class="nav-layer-title">
+                                <span>{{ getOneCategory(3,'title') }}</span>
+                            </div>
+                            <ul class="nav-org-people">
+                                @if (getArticlesBYCate(3,3)->isNotEmpty())
+                                    @foreach (getArticlesBYCate(3,3) as $article)
+                                        <li>
+                                            <a href="{{ $article->link }}">
+                                                <img src="{{ $article->cover_path }}">
+                                                <p class="nowrap">{{ $article->title }}</p>
+                                            </a>
+                                        </li>
+                                    @endforeach
+                                @endif
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="nav-layer-item nav-org-right">
+                        <!-- 机构设置 -->
+                        <div class="nav-layer-title ">
+                            <span>{{ getOneCategory(4,'title') }}</span>
+                        </div>
+                        <ul class="nav-org-flex">
+                            <li><a href="{{ getOneCategory(5,'link') }}">{{ getOneCategory(5,'title') }}</a></li>
+                            <li><a href="{{ getOneCategory(6,'link') }}">{{ getOneCategory(6,'title') }}</a></li>
+                            <li><a href="{{ getOneCategory(7,'link') }}">{{ getOneCategory(7,'title') }}</a></li>
+                            <li><a href="{{ getOneCategory(8,'link') }}">{{ getOneCategory(8,'title') }}</a></li>
+                            <li><a href="{{ getOneCategory(9,'link') }}">{{ getOneCategory(9,'title') }}</a></li>
+                        </ul>
+                        <div class="nav-layer-title"></div>
+                        <ul class="nav-org-flex">
+                            <li style="width: 100%;">
+                                <a href="{{ getOneCategory(39,'link') }}">{{ getOneCategory(39,'title') }}</a></li>
+                            <li>
+                                <a href="{{ getOneCategory(37,'link') }}">{{ getOneCategory(37,'title') }}</a>
+                                @if (getCateChild(37)->isNotEmpty())
+                                    @foreach (getCateChild(37) as $child)
+                                        <p><a href="{{ $child->link }}">{{ $child->title }}</a></p>
+                                    @endforeach
+                                @endif
+                            </li>
+                            <li>
+                                <a href="{{ getOneCategory(38,'link') }}">{{ getOneCategory(38,'title') }}</a>
+                                @if (getCateChild(38)->isNotEmpty())
+                                    @foreach (getCateChild(38) as $child)
+                                        <p><a href="{{ $child->link }}">{{ $child->title }}</a></p>
+                                    @endforeach
+                                @endif
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
+            <li class="nav-ul-li @if (isset($parent) && $parent->id==config('haai.category.kxyj')) show @endif">
+                <a href="{{ getOneCategory(config('haai.category.kxyj'),'link') }}">{{ getOneCategory(config('haai.category.kxyj'),'title') }}</a>
+                <div class="nav-layer hide">
+                    <div class="nav-layer-item nav-science-left">
+                        <!-- 创新单元 -->
+                    {{--                        <div class="nav-layer-title">--}}
+                    {{--                            <span>{{ getOneCategory(11,'title') }}</span>--}}
+                    {{--                        </div>--}}
+                    {{--                        <div class="nav-science-block">--}}
+                    {{--                            <a class="nav-science-cover" href="#" style="background-image: url(/assets/index/img/banner_00.jpeg);"></a>--}}
+                    {{--                            <ul class="nav-science-ul">--}}
+                    {{--                                <li class="nowrap">--}}
+                    {{--                                    <i class="fa fa-caret-right"></i>--}}
+                    {{--                                    <a href="#">熔融沉积式工业3D打印机</a>--}}
+                    {{--                                </li>--}}
+                    {{--                                <li class="nowrap">--}}
+                    {{--                                    <i class="fa fa-caret-right"></i>--}}
+                    {{--                                    <a href="#">3D测量与打印技术研发与应用</a>--}}
+                    {{--                                </li>--}}
+                    {{--                                <li class="nowrap">--}}
+                    {{--                                    <i class="fa fa-caret-right"></i>--}}
+                    {{--                                    <a href="#">智能花光伏发电装置</a>--}}
+                    {{--                                </li>--}}
+                    {{--                                <li class="nowrap">--}}
+                    {{--                                    <i class="fa fa-caret-right"></i>--}}
+                    {{--                                    <a href="#">铝合金轻量化制造及试验生产线关键技术研究铝合金轻量化制造及试验生产线关键技术研究铝合金轻量化制造及试验生产线关键技术研究</a>--}}
+                    {{--                                </li>--}}
+                    {{--                                <li class="nowrap">--}}
+                    {{--                                    <i class="fa fa-caret-right"></i>--}}
+                    {{--                                    <a href="#">基于物联网技术的城市再生资源回收信息化技术</a>--}}
+                    {{--                                </li>--}}
+                    {{--                            </ul>--}}
+                    {{--                        </div>--}}
+                    <!-- 科技奖励 -->
+                        <div class="nav-layer-title">
+                            <span>{{ getOneCategory(13,'title') }}</span>
+                        </div>
+                        <div class="nav-science-block">
+                            @if(getArticlesBYCate(13,6)->isNotEmpty())
+                                @foreach (getArticlesBYCate(13,6) as $article)
+                                    @if ($loop->first)
+                                        <a class="nav-science-cover" href="{{ $article->link }}" style="background-image: url({{ $article->cover_path }});">
+                                        </a>
+                                    @endif
+                                @endforeach
+                                <ul class="nav-science-ul">
+                                    @foreach (getArticlesBYCate(13,6) as $article)
+                                        @if ($loop->iteration>1)
+                                            <li class="nowrap">
+                                                <i class="fa fa-caret-right"></i>
+                                                <a href="{{ $article->link }}"> {{ $article->title }}</a>
+                                            </li>
+                                        @endif
+                                    @endforeach
+                                </ul>
+                            @endif
+                        </div>
+                    </div>
+                    <div class="nav-layer-item nav-science-right">
+                        <!-- 科研产出 -->
+                        <div class="nav-layer-title">
+                            <span>{{ getOneCategory(12,'title') }}</span>
+                        </div>
+                        <div class="nav-science-covers">
+                            @if(getCateChild(12)->isNotEmpty())
+                                @foreach (getCateChild(12) as $children)
+                                    <a class="nav-science-covers-item nav-science-cover-10" href="{{ $children->link }}"
+                                       style="background-image: url({{ $children->cover_path }});"></a>
+                                @endforeach
+                            @endif
+                        </div>
+                        <!-- 科研进展 -->
+                        {{--                        <div class="nav-layer-title">--}}
+                        {{--                            <span>科研进展</span>--}}
+                        {{--                        </div>--}}
+                        {{--                        <ul class="nav-science-ul">--}}
+                        {{--                            <li class="nowrap">--}}
+                        {{--                                <i class="fa fa-caret-right"></i>--}}
+                        {{--                                <a href="#">熔融沉积式工业3D打印机</a>--}}
+                        {{--                            </li>--}}
+                        {{--                            <li class="nowrap">--}}
+                        {{--                                <i class="fa fa-caret-right"></i>--}}
+                        {{--                                <a href="#">3D测量与打印技术研发与应用</a>--}}
+                        {{--                            </li>--}}
+                        {{--                            <li class="nowrap">--}}
+                        {{--                                <i class="fa fa-caret-right"></i>--}}
+                        {{--                                <a href="#">智能花光伏发电装置</a>--}}
+                        {{--                            </li>--}}
+                        {{--                            <li class="nowrap">--}}
+                        {{--                                <i class="fa fa-caret-right"></i>--}}
+                        {{--                                <a href="#">铝合金轻量化制造及试验生产线关键技术研究铝合金轻量化制造及试验生产线关键技术研究铝合金轻量化制造及试验生产线关键技术研究</a>--}}
+                        {{--                            </li>--}}
+                        {{--                            <li class="nowrap">--}}
+                        {{--                                <i class="fa fa-caret-right"></i>--}}
+                        {{--                                <a href="#">基于物联网技术的城市再生资源回收信息化技术</a>--}}
+                        {{--                            </li>--}}
+                        {{--                        </ul>--}}
+                    </div>
+                </div>
+            </li>
+            <li class="nav-ul-li @if (isset($parent) && $parent->id==config('haai.category.cgzh')) show @endif">
+                <a href="{{ getOneCategory(config('haai.category.cgzh'),'link') }}">{{ getOneCategory(config('haai.category.cgzh'),'title') }}</a>
+                <div class="nav-layer hide">
+                    <div class="nav-layer-item nav-results-item">
+                        <a class="nav-results-cover" style="background-image: url({{ getOneCategory(20,'cover_path') }});" href="{{ getOneCategory(20,'link') }}"></a>
+                        <ul class="nav-science-ul nav-results-ul">
+                            @if(getArticlesBYCate(20,5)->isNotEmpty())
+                                @foreach (getArticlesBYCate(20,5) as $article)
+                                    <li class="nowrap">
+                                        <i class="fa fa-caret-right"></i>
+                                        <a href="{{ $article->link }}">
+                                            {{ $article->title }}
+                                            <span>{{ $article->created_at->format('Y-m-d') }}</span>
+                                        </a>
+                                    </li>
+                                @endforeach
+                            @endif
+                        </ul>
+                    </div>
+                    <div class="nav-layer-item nav-results-item">
+                        <a class="nav-results-cover" style="background-image: url({{ getOneCategory(21,'cover_path') }});" href="{{ getOneCategory(21,'link') }}"></a>
+                        <ul class="nav-science-ul nav-results-ul">
+                            @if(getArticlesBYCate(21,5)->isNotEmpty())
+                                @foreach (getArticlesBYCate(21,5) as $article)
+                                    <li class="nowrap">
+                                        <i class="fa fa-caret-right"></i>
+                                        <a href="{{ $article->link }}">
+                                            {{ $article->title }}
+                                            <span>{{ $article->created_at->format('Y-m-d') }}</span>
+                                        </a>
+                                    </li>
+                                @endforeach
+                            @endif
+                        </ul>
+                    </div>
+                </div>
+            </li>
+            <li class="nav-ul-li @if (isset($parent) && $parent->id==config('haai.category.rcdw')) show @endif">
+                <a href="{{ getOneCategory(config('haai.category.rcdw'),'link') }}">{{ getOneCategory(config('haai.category.rcdw'),'title') }}</a>
+                <div class="nav-layer hide">
+                    <div class="nav-layer-item nav-talent-left">
+                        <!-- 高级职称专家 -->
+                        <div class="nav-layer-title">
+                            <span>{{ getOneCategory(29,'title') }}</span>
+                        </div>
+                        <ul class="nav-talent-ul">
+                            @if (getArticlesBYCate(29,14)->isNotEmpty())
+                                @foreach (getArticlesBYCate(29,14) as $article)
+                                    <li>
+                                        <a href="{{  $article->link }}">
+                                            <span class="nav-talent-cover" style="background-image: url({{ $article->cover_path }});"></span>
+                                            <h3 class="nav-talent-name">{{ $article->title }}</h3>
+                                            <p class="nav-talent-job">{{ $article->job }}</p>
+                                        </a>
+                                    </li>
+                                @endforeach
+                            @endif
+                        </ul>
+                    </div>
+                    <div class="nav-layer-item nav-talent-right">
+                        <!-- 省级领军人才梯队 -->
+                        <div class="nav-layer-title">
+                            <span>{{ getOneCategory(30,'title') }}</span>
+                        </div>
+                        <div class="nav-talent-team">
+                            @if (getCateChild(30) && !empty(getCateChild(30)))
+                                @foreach (getCateChild(30) as $children)
+                                    <a class="nav-talent-team-item" style="background-image: url({{ $children->cover_path }});" href="{{ $children->link }}"></a>
+                                @endforeach
+                            @endif
+                        </div>
+                    </div>
+                </div>
+            </li>
+            <li class="nav-ul-li @if (isset($parent) && $parent->id==config('haai.category.djkxwh')) show @endif">
+                <a href="{{ getOneCategory(config('haai.category.djkxwh'),'link') }}">{{ getOneCategory(config('haai.category.djkxwh'),'title') }}</a>
+                <div class="nav-layer hide">
+                    <div class="nav-layer-item nav-science-left">
+                        <!-- 工作动态 -->
+                        <div class="nav-layer-title">
+                            <span>{{ getOneCategory(32,'title') }}</span>
+                        </div>
+                        <div class="nav-science-block">
+                            @if(getArticlesBYCate(32,6)->isNotEmpty())
+                                @foreach (getArticlesBYCate(32,6) as $article)
+                                    @if ($loop->first)
+                                        <a class="nav-science-cover" href="{{ $article->link }}" style="background-image: url({{ $article->cover_path }});">
+                                        </a>
+                                    @endif
+                                @endforeach
+                                <ul class="nav-science-ul">
+                                    @foreach (getArticlesBYCate(32,6) as $article)
+                                        @if ($loop->iteration>1)
+                                            <li class="nowrap">
+                                                <i class="fa fa-caret-right"></i>
+                                                <a href="{{ $article->link }}"> {{ $article->title }}</a>
+                                            </li>
+                                        @endif
+                                    @endforeach
+                                </ul>
+                            @endif
+
+                        </div>
+                        <!-- 反腐倡廉 -->
+                        <div class="nav-layer-title">
+                            <span>{{ getOneCategory(33,'title') }}</span>
+                        </div>
+                        <div class="nav-science-block">
+                            @if(getArticlesBYCate(33,6)->isNotEmpty())
+                                @foreach (getArticlesBYCate(33,6) as $article)
+                                    @if ($loop->first)
+                                        <a class="nav-science-cover" href="{{ $article->link }}" style="background-image: url({{ $article->cover_path }});">
+                                        </a>
+                                    @endif
+                                @endforeach
+                                <ul class="nav-science-ul">
+                                    @foreach (getArticlesBYCate(33,6) as $article)
+                                        @if ($loop->iteration>1)
+                                            <li class="nowrap">
+                                                <i class="fa fa-caret-right"></i>
+                                                <a href="{{ $article->link }}"> {{ $article->title }}</a>
+                                            </li>
+                                        @endif
+                                    @endforeach
+                                </ul>
+                            @endif
+
+                        </div>
+                    </div>
+                    <div class="nav-layer-item nav-science-right">
+                        <!-- 先进事迹 -->
+                        <div class="nav-layer-title">
+                            <span>{{ getOneCategory(34,'title') }}</span>
+                        </div>
+                        <ul class="nav-science-ul">
+                            @if(getArticlesBYCate(34,8)->isNotEmpty())
+                                @foreach (getArticlesBYCate(34,8) as $article)
+                                    @if ($loop->iteration>1)
+                                        <li class="nowrap">
+                                            <i class="fa fa-caret-right"></i>
+                                            <a href="{{ $article->link }}">{{ $article->title }}</a>
+                                        </li>
+                                    @endif
+                                @endforeach
+                            @endif
+
+                        </ul>
+                        <a class="nav-results-cover" style="background-image: url({{ getOneCategory(34,'cover_path') }});" href="{{ getOneCategory(34,'link') }}"></a>
+                    </div>
+                </div>
+            </li>
+        </ul>
+    </div>
+</nav>
+<!-- end nav -->
--- a/resources/views/layouts/left.blade.php
+++ b/resources/views/layouts/left.blade.php
@@ -1,20 +0,0 @@
-  <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>
-        @endforeach
-      </ul>
-    </div>
-    <div class="newsbox">
-      <div class="titbox">
-        <p class="ccsl">联系我们 </p>
-      </div>
-      <div class="lxwmbox">
-        <div>黑龙江省杂志社<br /> 联系电话：82316133<br />投稿邮箱：hlj16133@163.com</div>
-      </div>
-    </div>
-  </div>
--- a/resources/views/layouts/pagination.blade.php
+++ b/resources/views/layouts/pagination.blade.php
@@ -0,0 +1,32 @@
+@if ($paginator->hasPages())
+    <div class="pages">
+
+        {{-- Previous Page Link --}}
+        @if ($paginator->onFirstPage())
+            <a href="#" style="pointer-events: none;">上一页</a>
+        @else
+            <a href="{{ $paginator->previousPageUrl() }}">上一页</a>
+        @endif
+
+        {{-- Pagination Elements --}}
+        @foreach ($elements as $element)
+            {{-- Array Of Links --}}
+            @if (is_array($element))
+                @foreach ($element as $page => $url)
+                    @if ($page == $paginator->currentPage())
+                        <a href="{{ $url }}" class="show">{{ $page }}</a>
+                    @else
+                        <a href="{{ $url }}">{{ $page }}</a>
+                    @endif
+                @endforeach
+            @endif
+        @endforeach
+
+        {{-- Next Page Link --}}
+        @if ($paginator->hasMorePages())
+            <a href="{{ $paginator->nextPageUrl() }}">下一页</a>
+        @else
+            <a href="#" style="pointer-events: none;">下一页</a>
+        @endif
+    </div>
+@endif
--- a/resources/views/patents/list.blade.php
+++ b/resources/views/patents/list.blade.php
@@ -0,0 +1,50 @@
+@extends('layouts.app')
+
+@section('title', '论文/专利')
+
+@section('content')
+    <!-- content -->
+    <div class="container mian">
+        <!-- content-nav -->
+        <nav class="mian-nav">
+            <ul class="mian-nav-ul">
+                <li class="show">
+                    <a href="{{ route('patents.list',['type'=>'pager']) }}">论文</a>
+                </li>
+                <li class="show">
+                    <a href=" {{ route('patents.list',['type'=>'patent']) }}">专利</a>
+                </li>
+            </ul>
+        </nav>
+        <!-- content-content -->
+        <div class="mian-content">
+            <div class="mian-content-header">
+                <a href="#">首页</a>
+                <i class="fa fa-caret-right"></i>
+                <a href="{{ url()->current() }}">论文/专利</a>
+            </div>
+            <!-- 文章列表 -->
+            <ul class="results-news-ul">
+                @if ($patents->isNotEmpty())
+                    @foreach ($patents as $patent)
+                        <li>
+                            <a class="nowrap" href="{{ $patent->link }}">
+                                <i class="fa fa-angle-double-right"></i>
+                                {{ $patent->title }}
+                                <span>{{ $patent->created_at->format('Y-m-d') }}</span>
+                            </a>
+                        </li>
+                    @endforeach
+                @endif
+
+            </ul>
+        </div>
+        <!-- 分页 -->
+        <div class="pages">
+            @if ($patents->isNotEmpty())
+                {{ $patents->links('layouts.pagination') }}
+            @endif
+        </div>
+    </div>
+    <!-- end content -->
+@endsection
--- a/resources/views/patents/show.blade.php
+++ b/resources/views/patents/show.blade.php
@@ -0,0 +1,26 @@
+@extends('layouts.app')
+
+@section('title', $patent->title)
+
+
+@section('content')
+    <!-- content -->
+    <div class="container details">
+        <!-- 文章标题 -->
+        <h3 class="details-title">{{ $patent->title }}</h3>
+        <p class="details-time">{{ $patent->created_at }}</p>
+        <!-- 文章详情 -->
+        <div class="details-content">
+            <img src="{{ $patent->cover_path }}">
+
+            {!!  $patent->content !!}
+        </div>
+        <!-- 下一篇 -->
+        @if ($next)
+            <div class="details-writings">
+
+                <a href="{{ $next->link }}">下一篇：{{ $next->title }}</a>
+            </div>
+        @endif
+    </div>
+@endsection
--- a/routes/web.php
+++ b/routes/web.php
@@ -12,9 +12,14 @@
 */
 Route::get('/', 'IndexController@index')->name('index');
 Route::get('articles/{category}/index', 'ArticleController@index')->name('article.index');
-Route::get('articles/{category}/picture', 'ArticleController@picture')->name('article.picture');
-Route::get('articles/{article}/picshow', 'ArticleController@picshow')->name('article.picshow');
 Route::get('articles/{article}', 'ArticleController@show')->name('article.show');
+Route::get('search', 'ArticleController@search')->name('article.search');
+
+Route::get('category/{category}/show', 'CategoryController@show')->name('category.show');//显示分类
+Route::get('category/{category}/list', 'CategoryController@list')->name('category.list');//显示分类
+
+Route::get('patents/{patent}/show', 'PatentController@show')->name('patents.show');
+Route::get('patents/list', 'PatentController@list')->name('patents.list');

 //以下为导入数据
 Route::get('test/set_category', 'TestController@set_category');