diff --git a/app/Admin/Controllers/Article/IndexController.php b/app/Admin/Controllers/Article/IndexController.php index 075d2b2..5464b8b 100644 --- a/app/Admin/Controllers/Article/IndexController.php +++ b/app/Admin/Controllers/Article/IndexController.php @@ -56,9 +56,6 @@ class IndexController extends AdminController $form->text('working', '工龄'); $form->text('job', '岗位'); }) - ->when('in', [56], function (Form $form) { - $form->text('url', '跳转地址'); - }) ->rules('required|min:1', [ 'required' => '必须选择所属分类', 'min' => '必须选择所属分类', diff --git a/app/Helpers/function.php b/app/Helpers/function.php index e1ffea7..d5abd41 100644 --- a/app/Helpers/function.php +++ b/app/Helpers/function.php @@ -1,99 +1,111 @@ -{$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(); - -} +{$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(); + +} + +//获取一个图片 +function getOneAdvert($category_id, $value = '') +{ + $info = Advert::where('category_id', $category_id)->first(); + if ($value) { + return $info->{$value}; + } + + return $info; +} diff --git a/resources/views/category/person.blade.php b/resources/views/category/person.blade.php new file mode 100644 index 0000000..e8856c1 --- /dev/null +++ b/resources/views/category/person.blade.php @@ -0,0 +1,55 @@ +@extends('layouts.app') + +@section('title', $category->title) + +@section('content') + +
+ + + +
+
+ 首页 + + {{ $category->title }} +
+ + + +
+ @if ($articles->isNotEmpty()) + {{ $articles->links('layouts.pagination') }} + @endif +
+
+ +
+ +@endsection diff --git a/resources/views/category/zzjg.blade.php b/resources/views/category/zzjg.blade.php index 25760f1..629b19f 100644 --- a/resources/views/category/zzjg.blade.php +++ b/resources/views/category/zzjg.blade.php @@ -81,7 +81,7 @@ -
+
{{ getOneCategory(50,'title') }}
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index bad0dcc..0cbecaa 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -3,6 +3,8 @@ @section('title'){{ config('app.name', '') }}@show + + @@ -11,80 +13,80 @@ @yield('js') - -
-
-
- 联系我们 - / - 网站地图 - / - 电子邮箱 -
-
- - -
-
-
- - -
-
- -
-

面向世界科技前沿，面向国家重大需求，面向国民经济主战场，面向人民生命健康，率先实现科学技术跨越发展，率先建成国家创新人才高地，率先建成国家高水平科技智库，率先建设国际一流科研机构。

-

——智能制造所办所方针

-
-
-
- - - - - +
+ + +
+
+
+ + +
+
+ +
+

面向世界科技前沿，面向国家重大需求，面向国民经济主战场，面向人民生命健康，率先实现科学技术跨越发展，率先建成国家创新人才高地，率先建成国家高水平科技智库，率先建设国际一流科研机构。

+

——智能制造所办所方针

+
+
+
+ -@include('layouts.header') + + + -@section('content') + @include('layouts.header') -@show + @section('content') -@if ($links->isNotEmpty()) + @show + + @if ($links->isNotEmpty())
@foreach ($links as $link) - {{ $link->title}} + {{ $link->title}} @endforeach
-@endif - - - - - - - - + + +