xuanchen/new_dqb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改

Browse Source
This commit is contained in:
徐永宾
2020-09-17 08:57:27 +08:00
parent ac3b53b163
commit a4162b5710
9 changed files with 223 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/ArticleController.php
View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use App\Models\Advert;
use App\Models\Article;
use Illuminate\Http\Request;
class ArticleController extends Controller
{
@@ -27,4 +28,18 @@ class ArticleController extends Controller
}
//搜索
public function search(Request $request)
{
$title = $request->title;
$articles = Article::where('status', 1)
->when($title, function ($q) use ($title) {
$q->where('title', 'like', "%{$title}%");
})
->paginate();
return view('article.search', compact('articles'));
}
}

2
app/Http/Controllers/CategoryController.php
View File

@@ -20,7 +20,7 @@ class CategoryController extends Controller
} else {
$articles = $category->relations(Category::TYPE_ARTICLE)->paginate(8);
$parent = $category;
if ($category->childrens->isEmpty()) {
if ($category->childrens->isEmpty() && $category->patent) {
$parent = $category->parent;
}

2
app/Http/Controllers/Controller.php
View File

@@ -22,7 +22,7 @@ class Controller extends BaseController
$categorys = Category::where('status', 1)
->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW])
->where('top_show', 1)
->orderBy('order', 'desc')
->orderBy('order', 'asc')
->select('id', 'title')
->get();
$links = Link::get();

41
public/assets/index/css/style.css
View File

@@ -118,7 +118,6 @@ img {
background-color: #eff0f4;
height: 40px;
line-height: 40px;
text-align: right;
}
.tool a {
@@ -135,6 +134,33 @@ img {
color: #203175;
}
.search {
margin-top: 5px;
width: 20%;
display: flex;
float: right;
}
.search input {
float: left;
flex: 4;
height: 30px;
outline: none;
border: 1px solid #203175;
box-sizing: border-box;
padding: 0 10px;
}
.search button {
float: right;
flex: 1;
height: 30px;
background-color: #203175;
color: white;
border-style: none;
outline: none;
}
/* 导航 */
.header {
padding: 10px 0;
@@ -264,7 +290,8 @@ img {
.news-hot-text {
padding: 10px;
background-color: rgba(0, 0, 0, .5);
height: 100px;
height: 30px;
width: 680px;
position: absolute;
bottom: 0;
left: 0;
@@ -284,16 +311,6 @@ img {
color: white;
}
.news-hot-more {
text-align: right;
padding-top: 10px;
}
.news-hot-more i {
margin-left: 5px;
color: #fff;
}
.news-title {
padding-top: 0;
box-sizing: border-box;

45
resources/views/article/search.blade.php Normal file
View File

@@ -0,0 +1,45 @@
@extends('layouts.app')
@section('title', '搜索结果')
@section('content')
<!-- mian -->
<div class="container child">
<!-- content -->
<div class="child-content sslb">
<ul class="spiritual-ul jlhz-border">
@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>
<li class="spiritual-ul-li">
<a href="{{ $article->link }}">
<h3 class="spiritual-title nowrap">{{ $article->title }}</h3>
<p class="spiritual-info nowrap-multi">
{{ $article->descriiption }}
</p>
</a>
</li>
@endforeach
@endif
</ul>
<!-- 分页 -->
<div class="pages">
@if ($articles->isNotEmpty())
{{ $articles->appends(['title'=>request()->title])->links('layouts.pagination') }}
@endif
</div>
</div>
</div>
<!-- end mian -->
@endsection

2
resources/views/category/show.blade.php
View File

@@ -9,7 +9,7 @@
<div class="child-nav">
<div class="kj-bjt">
<b>{{ $parent->title }}</b>
<p>Exchange and cooperation</p>
<p>{{ $parent->description }}</p>
</div>
<ul class="child-nav-ul">
@if ($parent->childrens->isNotEmpty())

264
resources/views/index/index.blade.php
View File

@@ -3,28 +3,43 @@
@section('title', '首页')
@section('content')
<!-- banner -->
@if (getAdvertsByCate(23)->isNotEmpty())
<div class="swiper-container" id="swiperBanner">
<div class="swiper-wrapper">
@foreach (getAdvertsByCate(23) as $advert)
<div class="swiper-slide">
<a class="swiper-banner-img" style="background-image: url({{ $advert->cover_path }});" href="">
<h3>{{ $advert->title }}</h3>
</a>
</div>
@endforeach
</div>
<div class="swiper-pagination"></div>
</div>
@endif
<!-- end banner -->
<!-- mian -->
<div class="container">
<!-- 院所新闻 -->
<div class="news">
<div class="news-item news-hot">
<img class="news-hot-cover" src="lib/img/banner_02.jpg">
<img class="news-hot-cover" src="{{ getOneAdvertByCate(20,'cover_path') }}">
<div class="news-hot-text">
<h3 class="nowrap"><a href="#">杜新宇副院长到大庆分院调研</a></h3>
<p class="nowrap-multi">
国家新闻出版署日前下发通知，确定《“十三五”国家重点图书、音像、电子出版物出版规划》第三次增补项目235个。规划实行动态管理，公布增补项目的同时，对撤销或变更的项目一并作出调整，确定出版单位申请撤销项目141个、变更项目14个。</p>
<p class="news-hot-more"><a href="#">详情<i class="fa fa-chevron-right"></i></a></p>
<h3 class="nowrap">
<a href="{{ getOneAdvertByCate(20,'url') }}">{{ getOneAdvertByCate(20,'title') }}</a></h3>
</div>
</div>
<div class="news-item news-ul">
<div class="mian-title news-title">
<b>{{ getOneCategory(6,'title') }}</b>
<span>/&nbsp;&nbsp;School news</span>
<a class="mian-title-more" href="{{ getOneCategory(6,'link') }}">更多<i class="fa fa-angle-right"></i></a>
<b>{{ getOneCategory(7,'title') }}</b>
<span>/&nbsp;&nbsp;{{ getOneCategory(7,'description') }}</span>
<a class="mian-title-more" href="{{ getOneCategory(7,'link') }}">更多<i class="fa fa-angle-right"></i></a>
</div>
<ul>
@if (getArticlesBYCate(6,8)->isNotEmpty())
@foreach (getArticlesBYCate(6,8) as $article)
@if (getArticlesBYCate(7,8)->isNotEmpty())
@foreach (getArticlesBYCate(7,8) as $article)
<li class="news-ul-li">
<a class="nowrap" href="{{ $article->link }}">
<span class="news-time">{{ $article->created_at->format('m-d') }}</span>{{ $article->title }}
@@ -38,13 +53,13 @@
<!-- 科研动态 -->
<div class="dynamic">
<div class="mian-title">
<b>{{ getOneCategory(9,'title') }}</b>
<span>/&nbsp;&nbsp;Scientific research dynamic</span>
<a class="mian-title-more" href="{{ getOneCategory(9,'link') }}">更多<i class="fa fa-angle-right"></i></a>
<b>{{ getOneCategory(8,'title') }}</b>
<span>/&nbsp; {{ getOneCategory(8,'description') }}</span>
<a class="mian-title-more" href="{{ getOneCategory(8,'link') }}">更多<i class="fa fa-angle-right"></i></a>
</div>
<ul class="dynamic-ul">
@if (getArticlesBYCate(9,3)->isNotEmpty())
@foreach (getArticlesBYCate(9,3) as $article)
@if (getArticlesBYCate(8,3)->isNotEmpty())
@foreach (getArticlesBYCate(8,3) as $article)
<li class="dynamic-ul-item">
<span class="dynamic-ul-cover" style="background-image: url({{ $article->cover_path }});"></span>
<div class="dynamic-ul-text">
@@ -59,8 +74,8 @@
</div>
<!-- 广告条 -->
<div class="index-ad">
<a href="{{ getOneAdvertByCate(28,'url') }}">
<img src="{{ getOneAdvertByCate(28,'cover_path') }}">
<a href="{{ getOneAdvertByCate(21,'url') }}">
<img src="{{ getOneAdvertByCate(21,'cover_path') }}">
</a>
</div>
@@ -68,14 +83,14 @@
<div class="news">
<div class="news-item party">
<div class="tabs-title" id="information">
<span class="tabs-item show">{{ getOneCategory(30,'title') }}</span>
<span class="tabs-item">{{ getOneCategory(29,'title') }}</span>
<span class="tabs-item show">{{ getOneCategory(10,'title') }}</span>
<span class="tabs-item">{{ getOneCategory(9,'title') }}</span>
</div>
<div class="tabs-content-wrapper" id="informationContent">
<!-- 国内资讯 -->
<ul class="party-ul tabs-content active">
@if (getArticlesBYCate(30,3)->isNotEmpty())
@foreach (getArticlesBYCate(30,3) as $article)
@if (getArticlesBYCate(10,3)->isNotEmpty())
@foreach (getArticlesBYCate(10,3) as $article)
<li class="party-ul-li">
<a href="{{ $article->link }}">
<span class="party-time">
@@ -91,8 +106,8 @@
</ul>
<ul class="party-ul tabs-content">
@if (getArticlesBYCate(29,12)->isNotEmpty())
@foreach (getArticlesBYCate(29,12) as $article)
@if (getArticlesBYCate(9,12)->isNotEmpty())
@foreach (getArticlesBYCate(9,12) as $article)
<li class="party-ul-li">
<a href="{{ $article->link }}">
<span class="party-time">
@@ -110,13 +125,13 @@
</div>
<div class="news-item spirit">
<div class="mian-title">
<b>{{ getOneCategory(16,'title') }}</b>
<span>/&nbsp;&nbsp;Spiritual civilization</span>
<a class="mian-title-more" href="{{ getOneCategory(16,'link') }}">更多<i class="fa fa-angle-right"></i></a>
<b>{{ getOneCategory(12,'title') }}</b>
<span>/&nbsp;&nbsp;{{ getOneCategory(12,'description') }}</span>
<a class="mian-title-more" href="{{ getOneCategory(12,'link') }}">更多<i class="fa fa-angle-right"></i></a>
</div>
<ul class="spiritual-ul">
@if (getArticlesBYCate(16,3)->isNotEmpty())
@foreach (getArticlesBYCate(16,3) as $article)
@if (getArticlesBYCate(12,3)->isNotEmpty())
@foreach (getArticlesBYCate(12,3) as $article)
<li class="spiritual-ul-li">
<a href="{{ $article->link }}">
<h3 class="spiritual-title nowrap">{{ $article->title }}</h3>
@@ -132,8 +147,8 @@
</div>
<!-- 广告条 -->
<div class="index-ad">
<a href="{{ getOneAdvertByCate(31,'url') }}">
<img src="{{ getOneAdvertByCate(31,'cover_path') }}">
<a href="{{ getOneAdvertByCate(22,'url') }}">
<img src="{{ getOneAdvertByCate(22,'cover_path') }}">
</a>
</div>
<!-- 新闻列表 -->
@@ -141,151 +156,116 @@
<!-- tabs -->
<div class="news-item party">
<div class="tabs-title" id="newsTab">
<span class="tabs-item show">创新团队</span>
<span class="tabs-item">梯队人才</span>
<span class="tabs-item">专家智库</span>
<span class="tabs-item">项目推广</span>
<span class="tabs-item">成果专利</span>
<a class="mian-title-more" href="">更多<i class="fa fa-angle-right"></i></a>
<span class="tabs-item show">{{ getOneCategory(13,'title') }}</span>
<span class="tabs-item">{{ getOneCategory(15,'title') }}</span>
<span class="tabs-item">{{ getOneCategory(14,'title') }}</span>
<span class="tabs-item">{{ getOneCategory(17,'title') }}</span>
<span class="tabs-item">{{ getOneCategory(16,'title') }}</span>
{{-- <a class="mian-title-more" href="">更多<i class="fa fa-angle-right"></i></a>--}}
</div>
<div class="tabs-content-wrapper" id="newsTabContent">
<!-- 创新团队 -->
<ul class="party-ul tabs-content active">
<li class="party-ul-li">
<a href="#">
@if (getArticlesBYCate(13,4)->isNotEmpty())
@foreach (getArticlesBYCate(13,4) as $article)
<li class="party-ul-li">
<a href="{{ $article->link }}">
<span class="party-time">
<h3>09</h3>
<p>2020-05</p>
<h3>{{ $article->created_at->format('d') }}</h3>
<p>{{ $article->created_at->format('Y-m') }}</p>
</span>
<h3 class="party-title nowrap">创新团队</h3>
<p class="party-info nowrap-multi">新华社北京7月25日电
为引领推动我国印刷业高质量发展，由国家新闻出版署主办的2019中国印刷业创新大会25日在京开幕。</p>
</a>
</li>
<li class="party-ul-li">
<a href="#">
<span class="party-time">
<h3>09</h3>
<p>2020-05</p>
</span>
<h3 class="party-title nowrap">创新团队</h3>
<p class="party-info nowrap-multi">新华社北京7月25日电
为引领推动我国印刷业高质量发展，由国家新闻出版署主办的2019中国印刷业创新大会25日在京开幕。</p>
</a>
</li>
<li class="party-ul-li">
<a href="#">
<span class="party-time">
<h3>09</h3>
<p>2020-05</p>
</span>
<h3 class="party-title nowrap">创新团队</h3>
<p class="party-info nowrap-multi">新华社北京7月25日电
为引领推动我国印刷业高质量发展，由国家新闻出版署主办的2019中国印刷业创新大会25日在京开幕。</p>
</a>
</li>
<li class="party-ul-li">
<a href="#">
<span class="party-time">
<h3>09</h3>
<p>2020-05</p>
</span>
<h3 class="party-title nowrap">创新团队</h3>
<p class="party-info nowrap-multi">新华社北京7月25日电
为引领推动我国印刷业高质量发展，由国家新闻出版署主办的2019中国印刷业创新大会25日在京开幕。</p>
</a>
</li>
<h3 class="party-title nowrap">{{ $article->title }}</h3>
<p class="party-info nowrap-multi">{{ $article->description }}</p>
</a>
</li>
@endforeach
@endif
</ul>
<!-- 梯队人才 -->
<ul class="party-ul tabs-content">
<li class="party-ul-li">
<a href="#">
<span class="party-time party-cover" style="background-image:url(lib/img/banner_02.jpg)">
@if (getArticlesBYCate(13,4)->isNotEmpty())
@foreach (getArticlesBYCate(13,4) as $article)
<li class="party-ul-li">
<a href="{{ $article->link }}">
<span class="party-time party-cover" style="background-image:url({{ $article->cover_path }})">
</span>
<h3 class="party-title nowrap">梯队人才</h3>
<p class="party-info nowrap-multi">新华社北京7月25日电
为引领推动我国印刷业高质量发展，由国家新闻出版署主办的2019中国印刷业创新大会25日在京开幕。</p>
</a>
</li>
<h3 class="party-title nowrap">{{ $article->title }}</h3>
<p class="party-info nowrap-multi">{{ $article->description }}</p>
</a>
</li>
@endforeach
@endif
</ul>
<!-- 专家智库 -->
<ul class="party-ul tabs-content">
<li class="party-ul-li">
<a href="#">
<span class="party-time party-cover" style="background-image:url(lib/img/banner_02.jpg)">
@if (getArticlesBYCate(14,4)->isNotEmpty())
@foreach (getArticlesBYCate(14,4) as $article)
<li class="party-ul-li">
<a href="{{ $article->link }}">
<span class="party-time party-cover" style="background-image:url({{ $article->cover_path }})">
</span>
<h3 class="party-title nowrap">专家智库</h3>
<p class="party-info nowrap-multi">新华社北京7月25日电
为引领推动我国印刷业高质量发展，由国家新闻出版署主办的2019中国印刷业创新大会25日在京开幕。</p>
</a>
</li>
<h3 class="party-title nowrap">{{ $article->title }}</h3>
<p class="party-info nowrap-multi">{{ $article->description }}</p>
</a>
</li>
@endforeach
@endif
</ul>
<!-- 项目推广 -->
<ul class="party-ul tabs-content">
<li class="party-ul-li">
<a href="#">
@if (getArticlesBYCate(17,4)->isNotEmpty())
@foreach (getArticlesBYCate(17,4) as $article)
<li class="party-ul-li">
<a href="{{ $article->link }}">
<span class="party-time">
<h3>02</h3>
<p>2020-05</p>
<h3>{{ $article->created_at->format('d') }}</h3>
<p>{{ $article->created_at->format('Y-m') }}</p>
</span>
<h3 class="party-title nowrap">项目推广</h3>
<p class="party-info nowrap-multi">新华社北京7月25日电
为引领推动我国印刷业高质量发展，由国家新闻出版署主办的2019中国印刷业创新大会25日在京开幕。</p>
</a>
</li>
<h3 class="party-title nowrap">{{ $article->title }}</h3>
<p class="party-info nowrap-multi">{{ $article->description }}</p>
</a>
</li>
@endforeach
@endif
</ul>
<!-- 成果专利 -->
<ul class="party-ul tabs-content">
<li class="party-ul-li">
<a href="#">
@if (getArticlesBYCate(16,4)->isNotEmpty())
@foreach (getArticlesBYCate(16,4) as $article)
<li class="party-ul-li">
<a href="{{ $article->link }}">
<span class="party-time">
<h3>03</h3>
<p>2020-05</p>
<h3>{{ $article->created_at->format('d') }}</h3>
<p>{{ $article->created_at->format('Y-m') }}</p>
</span>
<h3 class="party-title nowrap">成果专利</h3>
<p class="party-info nowrap-multi">新华社北京7月25日电
为引领推动我国印刷业高质量发展，由国家新闻出版署主办的2019中国印刷业创新大会25日在京开幕。</p>
</a>
</li>
<h3 class="party-title nowrap">{{ $article->title }}</h3>
<p class="party-info nowrap-multi">{{ $article->description }}</p>
</a>
</li>
@endforeach
@endif
</ul>
</div>
</div>
<!-- 项目推广 -->
<div class="news-item spirit">
<div class="mian-title">
<b>媒体报道</b>
<span>/&nbsp;&nbsp;Project promotion</span>
<b>{{ getOneCategory(18,'title') }}</b>
<span>/&nbsp;&nbsp;{{ getOneCategory(18,'description') }}</span>
<a class="mian-title-more" href="">更多<i class="fa fa-angle-right"></i></a>
</div>
<ul class="spiritual-ul">
<li class="spiritual-ul-li">
<a href="#">
<h3 class="spiritual-title nowrap">省科学院大庆分院召开“学树典型表彰先进”全体党员大会</h3>
<p class="spiritual-info nowrap-multi">新华社北京7月25日电
为引领推动我国印刷业高质量发展，由国家新闻出版署主办的2019中国印刷业创新大会25日在京开幕。</p>
</a>
</li>
<li class="spiritual-ul-li">
<a href="#">
<h3 class="spiritual-title nowrap">省科学院大庆分院召开“学树典型表彰先进”全体党员大会</h3>
<p class="spiritual-info nowrap-multi">新华社北京7月25日电
为引领推动我国印刷业高质量发展，由国家新闻出版署主办的2019中国印刷业创新大会25日在京开幕。</p>
</a>
</li>
<li class="spiritual-ul-li">
<a href="#">
<h3 class="spiritual-title nowrap">省科学院大庆分院召开“学树典型表彰先进”全体党员大会</h3>
<p class="spiritual-info nowrap-multi">新华社北京7月25日电
为引领推动我国印刷业高质量发展，由国家新闻出版署主办的2019中国印刷业创新大会25日在京开幕。</p>
</a>
</li>
<li class="spiritual-ul-li">
<a href="#">
<h3 class="spiritual-title nowrap">省科学院大庆分院召开“学树典型表彰先进”全体党员大会</h3>
<p class="spiritual-info nowrap-multi">新华社北京7月25日电
为引领推动我国印刷业高质量发展，由国家新闻出版署主办的2019中国印刷业创新大会25日在京开幕。</p>
</a>
</li>
@if (getArticlesBYCate(18,4)->isNotEmpty())
@foreach (getArticlesBYCate(18,4) as $article)
<li class="spiritual-ul-li">
<a href="{{ $article->link }}">
<h3 class="spiritual-title nowrap">{{ $article->title }}</h3>
<p class="spiritual-info nowrap-multi"></p>
</a>
</li>
@endforeach
@endif
</ul>
</div>
</div>

8
resources/views/layouts/app.blade.php
View File

@@ -11,9 +11,17 @@
<link rel="stylesheet" type="text/css" href="{{ asset('assets/index/css/style.css') }}"/>
</head>
<body>
<!-- tool -->
<div class="tool">
<div class="container">
<form class="tool-search" action="{{ route('article.search') }}">
<div class="search">
<input type="text" placeholder="请输入..." name="title" value=""/>
<button type="submit">搜索</button>
</div>
</form>
<a href="#"><i class="fa fa-star"></i>加入收藏</a>
<a href="#"><i class="fa fa-globe"></i>院所网站</a>
</div>

1
routes/web.php
View File

@@ -12,6 +12,7 @@
*/
Route::get('/', 'IndexController@index')->name('index.index');
Route::get('articles/{article}', 'ArticleController@show')->name('article.show');
Route::get('search', 'ArticleController@search')->name('article.search');
Route::get('category/{category}', 'CategoryController@index')->name('category.show');