阶段更新

app/Admin/Controllers/Article/IndexController.php

@@ -34,13 +34,13 @@ class IndexController extends AdminController
         $grid->column('id', '#ID#');
         $grid->column('cover', '封面图片')->image('', 100);
         $grid->column('category.title', '所属分类');
-        $grid->column('category_old.title', '所属老分类');
         $grid->column('title', '文章标题');
         $states = [
             'on'  => ['value' => 1, 'text' => '打开', 'color' => 'primary'],
             'off' => ['value' => 2, 'text' => '关闭', 'color' => 'default'],
         ];
         $grid->column('status', '状态')->switch($states);
+        $grid->column('recommen', '推荐')->switch();
         $grid->column('sort', '序号');
         $grid->column('created_at', '创建时间');
 
@@ -63,6 +63,10 @@ class IndexController extends AdminController
              ->move('images/' . date('Y/m/d'))
              ->removable()
              ->uniqueName();
+        $form->image('logo', 'logo')
+             ->move('images/' . date('Y/m/d'))
+             ->removable()
+             ->uniqueName();
         $form->ueditor('content', '文章内容')->rules('required', ['required' => '详情不能为空']);
         $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
         $states = [
@@ -71,6 +75,7 @@ class IndexController extends AdminController
         ];
         $form->datetime('created_at', '发布时间');
         $form->switch('status', '状态')->states($states)->default(1);
+        $form->switch('recommen', '推荐')->default(0);
 
         return $form;
     }

app/Admin/Controllers/Category/IndexController.php

@@ -44,6 +44,9 @@ class IndexController extends AdminController
                                   })->pluck('title', 'id');
                               })->help('当分类类型是文章详情的时候需要选择关联文章');
                      })
+                     ->when(Category::TYPE_LINK, function (WidgetsForm $form) {
+                         $form->text('url', '跳转地址');
+                     })
                      ->required();
                 $form->textarea('description', '分类简介')
                      ->rules('nullable');
@@ -114,6 +117,9 @@ class IndexController extends AdminController
                           })->pluck('title', 'id');
                       })->help('当分类类型是文章详情的时候需要选择关联文章');
              })
+             ->when(Category::TYPE_LINK, function (Form $form) {
+                 $form->text('url', '跳转地址');
+             })
              ->required()
              ->rules('required');
         $form->textarea('description', '分类简介')->rows(4)->rules('nullable');

app/Admin/Controllers/Video/IndexController.php

@@ -31,9 +31,9 @@ class IndexController extends AdminController
 
         $grid->column('id');
         $grid->column('title', '视频名称');
-        $grid->column('cover', '视频地址')->downloadable();
+        $grid->column('cover', '封面')->image();
+        $grid->column('link', '视频地址')->downloadable();
         $grid->column('category.title', '分类名称');
-        $grid->column('url', '地址');
         $grid->column('sort', '排序');
 
         return $grid;
@@ -60,7 +60,20 @@ class IndexController extends AdminController
                  'required' => '必须选择所属分类',
                  'min'      => '必须选择所属分类',
              ]);
-        $form->file('cover', '视频')
+
+        $form->file('cover', '封面')
+             ->rules(function ($form) {
+                 if ($form->model()->cover != []) {
+                     return 'nullable|image';
+                 } else {
+                     return 'required';
+                 }
+             })
+             ->move('images/' . date('Y/m/d'))
+             ->removable()
+             ->uniqueName();
+
+        $form->file('link', '视频')
              ->rules(function ($form) {
                  if ($form->model()->cover != []) {
                      return 'nullable|image';
@@ -71,7 +84,7 @@ class IndexController extends AdminController
              ->move('videos/' . date('Y/m/d'))
              ->removable()
              ->uniqueName();
-        $form->text('url', '链接地址');
+
         $form->number('sort', '排序')
              ->default(1)
              ->required()

app/Helpers/function.php

@@ -52,39 +52,36 @@ function getOneArticleBYCate($categoryId, $result = '')
  * @Date  : 2020/9/10 10:05
  * @param          $categoryId
  * @param  int     $take
- * @param  string  $mark
+ * @param  int     $recommen
  * @return \App\Models\Article
  */
-function getArticlesBYCate($categoryId, $take = 8, $mark = 'one')
+function getArticlesBYCate($categoryId, $take = 8, $recommen = 0)
 {
-    if ($mark == 'one') {
-        $articles = Article::where('status', 1)
-                           ->ByCategory($categoryId)
-                           ->latest('sort')
-                           ->latest()
-                           ->take($take)
-                           ->get();
-    } else {
     $cate = Category::find($categoryId);
     $ids  = $cate ? $cate->getAllChildrenId() : [];
 
     $articles = Article::where('status', 1)
-                           ->ByCategory($ids)
+                       ->ByCategory([$categoryId])
                        ->latest('sort')
                        ->latest()
+                       ->when($recommen, function ($q) use ($recommen) {
+                           $q->where('recommen', 1);
+                       })
                        ->take($take)
                        ->get();
-    }
 
     return $articles;
 }
 
 //获取子分类
-function getCateChild($categoryId)
+function getCateChild($categoryId, $take = '')
 {
     return Category::where('status', 1)
                    ->where('parent_id', $categoryId)
                    ->orderBy('order', 'desc')
+                   ->when($take, function ($q) use ($take) {
+                       $q->take($take);
+                   })
                    ->get();
 }
 

app/Http/Controllers/CategoryController.php

@@ -18,17 +18,19 @@ class CategoryController extends Controller
     {
         if ($category->type == Category::TYPE_SHOW && $category->article_id) {
             return redirect("articles/" . $category->article_id);
+        } elseif ($category->type == Category::TYPE_LINK && $category->url) {
+            return redirect()->away($category->url);
         } else {
             $template = 'show';
             if ($category->template) {
                 $template = $category->template;
             }
 
-            $articles = $category->relations(Category::TYPE_ARTICLE)
+            $articles = $category->relations($category->type)
                                  ->where('status', 1)
                                  ->latest('sort')
                                  ->latest('created_at')
-                                 ->paginate(8);
+                                 ->paginate();
 
             $parent = $category;
             if ($category->childrens->isEmpty() && $category->parent) {

app/Models/Article.php

@@ -17,6 +17,11 @@ class Article extends Model
         return route('article.show', $this);
     }
 
+    public function getLogoUrlAttribute(): string
+    {
+        return $this->parseImageUrl($this->logo);
+    }
+
     /***
      * Notes: 获取详情内图片
      * @Author: 玄尘

app/Models/Category.php

@@ -18,11 +18,13 @@ class Category extends Model
     public const TYPE_ARTICLE = 'article';
     public const TYPE_ADVERT  = 'advert';
     public const TYPE_VIDEO   = 'video';
+    public const TYPE_LINK    = 'link';
     public const TYPES        = [
         self::TYPE_ARTICLE => '文章列表',
         self::TYPE_SHOW    => '文章详情',
         self::TYPE_ADVERT  => '图片列表',
         self::TYPE_VIDEO   => '视频列表',
+        self::TYPE_LINK    => '跳转链接',
     ];
 
     public $cover_field = 'cover';
@@ -48,7 +50,8 @@ class Category extends Model
                 return $this->hasOne(Article::class)->where('id', $this->article_id);
                 break;
             case self::TYPE_ARTICLE:
-                return $this->belongsToMany(Article::class);
+                //                return $this->belongsToMany(Article::class);
+                return $this->hasMany(Article::class);
                 break;
             case self::TYPE_ADVERT:
                 return $this->hasMany(Advert::class);
@@ -85,13 +88,14 @@ class Category extends Model
     public function getAllChildrenId(): array
     {
         $ids = array_keys($this->buildSelectOptions([], $this->id));
+
         if ($ids) {
             array_unshift($ids, $this->id);
 
             return $ids;
         }
 
-        return [];
+        return [$this->id];
     }
 
     //    public function articles(): BelongsToMany

app/Models/Video.php

@@ -10,4 +10,9 @@ class Video extends Model
 
     use HasCovers,
         BelongsToCategory;
+
+    public function getLogoUrlAttribute(): string
+    {
+        return $this->parseImageUrl($this->logo);
+    }
 }

public/assets/index/css/style.css

@@ -308,7 +308,7 @@ body {
     top: 2px;
     width: 14px;
     height: 14px;
-    background: url(../image/indexIcon/indexNew_row.png) center no-repeat;
+    background: url(/assets/index/images/indexIcon/indexNew_row.png) center no-repeat;
 }
 
 .indexNew-list li .indexNew-name {
@@ -643,7 +643,7 @@ body {
 
 .modularServe-label {
     cursor: pointer;
-    background: url(../image/titleTem_back.png) no-repeat center;
+    background: url(/assets/index/images/titleTem_back.png) no-repeat center;
     background-size: cover;
     width: 100%;
     padding: 40px 20px 20px;
@@ -695,7 +695,7 @@ body {
     top: 4px;
     width: 15px;
     height: 15px;
-    background: url(../image/indexIcon/indexNew_row.png) center no-repeat;
+    background: url(/assets/index/images/indexIcon/indexNew_row.png) center no-repeat;
     background-size: 100% 100%;
 }
 

resources/views/category/djwh.blade.php

@@ -18,7 +18,7 @@
                     <div class="partyActivity">
                         <div class="party-title">
                             <span>{{ getOneCategory(60,'title') }}</span>
-                            <div class="party-title-more" data-href="{{ getOneCategory(60,'url') }}">更多&gt;&gt;</div>
+                            <div class="party-title-more" data-href="{{ getOneCategory(60,'link') }}">更多&gt;&gt;</div>
                         </div>
                         <div class="row">
                             @if (getArticlesBYCate(60,3)->isNotEmpty())
@@ -48,7 +48,7 @@
                     <div class="partyBuild briefMargin">
                         <div class="party-title">
                             <span>{{ getOneCategory(61,'title') }}</span>
-                            <div class="party-title-more" data-href="{{ getOneCategory(61,'url') }}">更多&gt;&gt;</div>
+                            <div class="party-title-more" data-href="{{ getOneCategory(61,'link') }}">更多&gt;&gt;</div>
                         </div>
                         <div class="row">
                             @if (getArticlesBYCate(61,3)->isNotEmpty())
@@ -110,7 +110,8 @@
                                 <div class="col-xs-12 col-md-8 partyVideo-padding">
                                     <div class="partyVideo-video">
                                         <video width="100%" height="100%" controls=""
-                                               src="{{ getVideoByCate(62,'cover_url') }}"
+                                               src="{{ getVideoByCate(62,'link_url') }}"
+                                               poster="{{ getVideoByCate(62,'cover_url') }}"
                                                style="object-fit: fill;">
 
                                         </video>

resources/views/category/jianjie.blade.php

@@ -171,7 +171,9 @@
                                 </div>
                                 <div class="briefVideo-video">
                                     <video width="100%" height="100%" controls
-                                           src="{{ getVideoByCate(15,'cover_url') }}">
+                                           src="{{ getVideoByCate(15,'link_url') }}"
+                                           poster="{{ getVideoByCate(15,'cover_url') }}"
+                                    >
                                     </video>
                                 </div>
                             </div>

resources/views/category/kxjs_rcdw.blade.php

@@ -100,7 +100,6 @@
                         </div>
                         <div class="ranksScholar">
                             <div class="row">
-
                                 @if(getCateChild(42)->isNotEmpty())
                                     @foreach(getCateChild(42) as $cate)
                                         <div class="col-xs-12 col-md-4 modularSix-padding">
@@ -128,7 +127,7 @@
                                 @if (getArticlesBYCate(43,6)->isNotEmpty())
                                     @foreach (getArticlesBYCate(43,6) as $info)
                                         <div class="col-xs-12 col-md-4">
-                                            <div class="publicHover ranksTeam-list" data-href="{{ $info->link }}">
+                                            <div class="publicHover ranksTeam-list">
                                                 <div class="ce-img ranksTeam-img">
                                                     <!-- 图片为4:3 -->
                                                     <span style="background-image: url({{ $info->cover_url }});"></span>

resources/views/category/kxyj.blade.php

@@ -354,8 +354,8 @@
                                     <div class="srSpread-video-paly">
                                         @if(getVideoByCate(29))
                                             <video width="100%" height="100%" controls=""
-                                                   src="{{ getVideoByCate(29,'cover_url') }}"
+                                                   src="{{ getVideoByCate(29,'link_url') }}"
-                                                   poster="/assets/index/images/text/textImg_00.jpg"
+                                                   poster="{{ getVideoByCate(29,'cover_url') }}"
                                                    style="object-fit: fill;">
                                             </video>
                                             <img class="srSpread-video-icon"

resources/views/category/navigation.blade.php

@@ -6,7 +6,7 @@
                     当前位置：
                     <div class="mrumbs-url">
                         <span class="publicHover" data-href="/">首页</span> &gt;
-                        <span class="publicHover" data-href="{{ $parent->link }}">{{ $parent->title }}</span>
+                        <span class="publicHover" data-href="{{ $category->link }}">{{ $category->title }}</span>
                     </div>
                 </div>
             </div>

resources/views/category/videos.blade.php

@@ -2,6 +2,11 @@
 
 @section('title', $parent->title)
 
+
+@section('css')
+    <link href="{{ asset('assets/index/css/video.css') }}" rel="stylesheet" type="text/css"/>
+@endsection
+
 @section('content')
     <!-- 面包屑导航 -->
     @include('category.navigation')
@@ -12,12 +17,44 @@
             <!-- 左侧导航部分 -->
         @include('category.left')
         <!-- 右侧内容部分 -->
+            @if ($articles->isNotEmpty())
                 <div class="col-xs-12 col-md-9">
                     <div class="levelRight">
-                        视频列表
+                        <div class="row">
+                            @foreach ($articles as $article)
+                                <div class="col-lg-4">
+                                    <div class="videoList">
+                                        <div class="ce-img videoImg m-video"
+                                             data-src="{{ $article->cover_url }}">
+                                            <span style="background-image: url(/assets/index/images/index-news.png);"></span>
+                                            <img class="videoImg-icon"
+                                                 src="/assets/index/images/srIcon/srSpread_icon_list.png"/>
+                                        </div>
+                                        <div class="videoText">
+                                            <p class="ce-nowrap-multi">{{ $article->title }}</p>
                                         </div>
                                     </div>
                                 </div>
+                            @endforeach
+                        </div>
+                    </div>
+                    <div class="pageUl">
+                        @if ($articles->isNotEmpty())
+                            {{ $articles->links('layouts.pagination') }}
+                        @endif
+                    </div>
+                </div>
+            @else
+                <div class="col-md-12 col-xs-12">
+                    <div class="no-searchCont">
+                        <img src="/assets/index/images/org55.png"/>
+                        <span>抱歉，暂无内容</span>
+                    </div>
+                </div>
+            @endif
+        </div>
     </div>
 @endsection
-
+@push('script')
+    <script type="text/javascript" src="{{ asset('assets/index/js/pingzi_video.js') }}"></script>
+@endpush

resources/views/index/index.blade.php

@@ -12,101 +12,73 @@
         <div class="publicTab">
             <ul id="myTabs" class="publicTab-ul" role="tablist">
                 <li role="presentation" class="active">
-                    <a href="#publicTab01" id="relationTab-01" role="tab" data-toggle="tab">
+                    <a href="#publicTab01" id="relationTab-01" class="new_list"
+                       data-link="{{ getOneCategory(66,'link') }}"
+                       role="tab" data-toggle="tab">
                         <img src="/assets/index/images/indexIcon/titleIcon_00.png"/>
-                        院所新闻
+                        {{ getOneCategory(66,'title') }}
                     </a>
                 </li>
                 <li role="presentation" class="">
-                    <a href="#publicTab02" id="relationTab-02" role="tab" data-toggle="tab">
+                    <a href="#publicTab02" id="relationTab-02" class="new_list"
+                       data-link="{{ getOneCategory(67,'link') }}"
+                       role="tab" data-toggle="tab">
                         <img src="/assets/index/images/indexIcon/titleIcon_01.png"/>
-                        通知公告
+                        {{ getOneCategory(67,'title') }}
                     </a>
                 </li>
             </ul>
-            <div class="publicTab-more">更多<span>+</span></div>
+            <div class="publicTab-more new_list_more" data-href="{{ getOneCategory(66,'link') }}">更多<span>+</span></div>
         </div>
         <div id="myTabContent" class="tab-content publicContent">
             <div role="tabpanel" class="tab-pane fade active in" id="publicTab01">
                 <div class="row">
+                    @if (getArticlesBYCate(66,7)->isNotEmpty())
                         <div class="col-md-6 col-xs-12">
                             <div class="indexNew-img ce-img">
-                            <span style="background-image: url(/assets/index/images/index-news.png);"></span>
+                                <span style="background-image: url({{getArticlesBYCate(66,8)->first()->cover_url}});"></span>
                             </div>
                         </div>
                         <div class="col-md-6 col-xs-12">
                             <ul class="indexNew-list">
-                            <li data-href="">
+                                @foreach (getArticlesBYCate(66,7) as $info)
+                                    <li data-href="{{ $info->link }}">
                                         <div class="publicHover indexNew-name">
-                                    <span class="ce-nowrap">一站式1人才招聘 面试结果公示</span>2020.06.21
+                                            <span class="ce-nowrap">{{ $info->title }}</span>{{ $info->created_at->toDateString() }}
                                         </div>
                                         <div class="ce-nowrap-multi indexNew-text">
-                                    黑龙江省科学院2020年生物学专业硕士研究生黑龙江省科学院2020年生物学专业硕士研究生
+                                            {{ $info->description }}
-                                </div>
-                            </li>
-                            <li data-href="">
-                                <div class="publicHover indexNew-name">
-                                    <span class="ce-nowrap">黑龙江省科学院 2020年招收硕士研究生调剂需求</span>2020.06.21
-                                </div>
-                                <div class="ce-nowrap-multi indexNew-text">
-                                    黑龙江省科学院2020年生物学专业硕士研究生黑龙江省科学院2020年生物学专业硕士研究生
-                                </div>
-                            </li>
-                            <li data-href="">
-                                <div class="publicHover indexNew-name">
-                                    <span class="ce-nowrap">学术讲座通知</span>2020.06.21
-                                </div>
-                                <div class="ce-nowrap-multi indexNew-text">
-                                    黑龙江省科学院2020年生物学专业硕士研究生黑龙江省科学院2020年生物学专业硕士研究生
-                                </div>
-                            </li>
-                            <li data-href="">
-                                <div class="publicHover indexNew-name">
-                                    <span class="ce-nowrap">国务院办公厅关于推进养老服务发展的意见</span>2020.06.21
-                                </div>
-                                <div class="ce-nowrap-multi indexNew-text">
-                                    黑龙江省科学院2020年生物学专业硕士研究生黑龙江省科学院2020年生物学专业硕士研究生
-                                </div>
-                            </li>
-                            <li data-href="">
-                                <div class="publicHover indexNew-name">
-                                    <span class="ce-nowrap">《关于统筹推进自然资源资产产权制度改革的指导意见》</span>2020.06.21
-                                </div>
-                                <div class="ce-nowrap-multi indexNew-text">
-                                    黑龙江省科学院2020年生物学专业硕士研究生黑龙江省科学院2020年生物学专业硕士研究生
-                                </div>
-                            </li>
-                            <li data-href="">
-                                <div class="publicHover indexNew-name">
-                                    <span class="ce-nowrap">《资源资产产权制度》</span>2020.06.21
-                                </div>
-                                <div class="ce-nowrap-multi indexNew-text">
-                                    黑龙江省科学院2020年生物学专业硕士研究生黑龙江省科学院2020年生物学专业硕士研究生
                                         </div>
                                     </li>
+                                @endforeach
                             </ul>
                         </div>
+                    @endif
                 </div>
             </div>
             <div role="tabpanel" class="tab-pane fade" id="publicTab02">
                 <div class="row">
+                    @if (getArticlesBYCate(67,7)->isNotEmpty())
                         <div class="col-md-6 col-xs-12">
                             <div class="indexNew-img ce-img">
-                            <span style="background-image: url(/assets/index/images/index-news.png);"></span>
+                                <span style="background-image: url({{getArticlesBYCate(67,8)->first()->cover_url}});"></span>
                             </div>
                         </div>
                         <div class="col-md-6 col-xs-12">
                             <ul class="indexNew-list">
-                            <li data-href="">
+                                @foreach (getArticlesBYCate(67,7) as $info)
-                                <div class="indexNew-name">
+                                    <li data-href="{{ $info->link }}">
-                                    <span class="ce-nowrap">通知公告</span>2020.06.21
+                                        <div class="publicHover indexNew-name">
+                                            <span class="ce-nowrap">{{ $info->title }}</span>{{ $info->created_at->toDateString() }}
                                         </div>
                                         <div class="ce-nowrap-multi indexNew-text">
-                                    黑龙江省科学院2020年生物学专业硕士研究生黑龙江省科学院2020年生物学专业硕士研究生
+                                            {{ $info->description }}
                                         </div>
                                     </li>
+                                @endforeach
                             </ul>
                         </div>
+                    @endif
                 </div>
             </div>
         </div>
@@ -153,67 +125,17 @@
         </div>
         <div class="modularTwo">
             <div class="row">
-                <div class="publicHover modularTwo-list col-xs-12">
+                @if (getArticlesBYCate(18,10)->isNotEmpty())
+                    @foreach (getArticlesBYCate(18,10) as $info)
+                        <div class="publicHover modularTwo-list col-xs-12" data-href="{{ $info->link }}">
                             <div class="ce-img modularTwo-list-img">
                                 <!-- 图片比例（4:3） -->
-                        <span style="background-image: url(/assets/index/images/text/textImg_00.jpg);"></span>
+                                <span style="background-image: url({{ $info->cover_url }});"></span>
                             </div>
-                    <div class="ce-nowrap modularTwo-list-name">湿地全球变化生态</div>
+                            <div class="ce-nowrap modularTwo-list-name">{{ $info->title }}</div>
-                </div>
-                <div class="publicHover modularTwo-list col-xs-12">
-                    <div class="ce-img modularTwo-list-img">
-                        <span style="background-image: url(/assets/index/images/text/textImg_01.jpg);"></span>
-                    </div>
-                    <div class="ce-nowrap modularTwo-list-name">寒温带森林生物多样性</div>
-                </div>
-                <div class="publicHover modularTwo-list col-xs-12">
-                    <div class="ce-img modularTwo-list-img">
-                        <span style="background-image: url(/assets/index/images/text/textImg_02.jpg);"></span>
-                    </div>
-                    <div class="ce-nowrap modularTwo-list-name">生态保护与恢复</div>
-                </div>
-                <div class="publicHover modularTwo-list col-xs-12">
-                    <div class="ce-img modularTwo-list-img">
-                        <span style="background-image: url(/assets/index/images/text/textImg_03.jpg);"></span>
-                    </div>
-                    <div class="ce-nowrap modularTwo-list-name">特色观赏植物培育与利用</div>
-                </div>
-                <div class="publicHover modularTwo-list col-xs-12">
-                    <div class="ce-img modularTwo-list-img">
-                        <span style="background-image: url(/assets/index/images/text/textImg_04.jpg);"></span>
-                    </div>
-                    <div class="ce-nowrap modularTwo-list-name">特色经济植物与利用</div>
-                </div>
-                <div class="publicHover modularTwo-list col-xs-12">
-                    <div class="ce-img modularTwo-list-img">
-                        <span style="background-image: url(/assets/index/images/text/textImg_05.jpg);"></span>
-                    </div>
-                    <div class="ce-nowrap modularTwo-list-name">湿地全球变化生态</div>
-                </div>
-                <div class="publicHover modularTwo-list col-xs-12">
-                    <div class="ce-img modularTwo-list-img">
-                        <span style="background-image: url(/assets/index/images/text/textImg_06.jpg);"></span>
-                    </div>
-                    <div class="ce-nowrap modularTwo-list-name">寒温带森林生物多样性</div>
-                </div>
-                <div class="publicHover modularTwo-list col-xs-12">
-                    <div class="ce-img modularTwo-list-img">
-                        <span style="background-image: url(/assets/index/images/text/textImg_07.jpg);"></span>
-                    </div>
-                    <div class="ce-nowrap modularTwo-list-name">生态保护与恢复</div>
-                </div>
-                <div class="publicHover modularTwo-list col-xs-12">
-                    <div class="ce-img modularTwo-list-img">
-                        <span style="background-image: url(/assets/index/images/text/textImg_08.jpg);"></span>
-                    </div>
-                    <div class="ce-nowrap modularTwo-list-name">特色观赏植物培育与利用</div>
-                </div>
-                <div class="publicHover modularTwo-list col-xs-12">
-                    <div class="ce-img modularTwo-list-img">
-                        <span style="background-image: url(/assets/index/images/text/textImg_09.jpg);"></span>
-                    </div>
-                    <div class="ce-nowrap modularTwo-list-name">特色经济植物与利用</div>
                         </div>
+                    @endforeach
+                @endif
             </div>
         </div>
     </div>
@@ -231,46 +153,24 @@
         </div>
         <div class="modularThree">
             <div class="row">
+                @if (getArticlesBYCate(31,3)->isNotEmpty())
+                    @foreach (getArticlesBYCate(31,3) as $info)
                         <div class="publicHover col-md-4 col-xs-12">
                             <div class="modularThree-back">
-                        <div class="modularThree-name">植物学科</div>
+                                <div class="modularThree-name">{{ $info->title }}</div>
                                 <div class="modularThree-list">
                                     <div class="ce-img modularThree-list-img">
                                         <!-- 图片比例（5:3） -->
-                                <span style="background-image: url(/assets/index/images/text/textImg_10.jpg);"></span>
+                                        <span style="background-image: url({{ $info->cover_url }});"></span>
                                     </div>
                                     <div class="ce-nowrap-multi modularThree-list-text">
-                                2002年4月11日上午，建投集团大数据公司、哈尔滨工程大学计算机学院、省科学院智能制造研
+                                        {{ $info->description }}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="publicHover col-md-4 col-xs-12">
-                    <div class="modularThree-back">
-                        <div class="modularThree-name">生态学科</div>
-                        <div class="modularThree-list">
-                            <div class="ce-img modularThree-list-img">
-                                <span style="background-image: url(/assets/index/images/text/textImg_11.jpg);"></span>
-                            </div>
-                            <div class="ce-nowrap-multi modularThree-list-text">
-                                2002年4月11日上午，建投集团大数据公司、哈尔滨工程大学计算机学院、省科学院智能制造研
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="publicHover col-md-4 col-xs-12">
-                    <div class="modularThree-back">
-                        <div class="modularThree-name">园林植物学科</div>
-                        <div class="modularThree-list">
-                            <div class="ce-img modularThree-list-img">
-                                <span style="background-image: url(/assets/index/images/text/textImg_12.jpg);"></span>
-                            </div>
-                            <div class="ce-nowrap-multi modularThree-list-text">
-                                2002年4月11日上午，建投集团大数据公司、哈尔滨工程大学计算机学院、省科学院智能制造研
                                     </div>
                                 </div>
                             </div>
                         </div>
+                    @endforeach
+                @endif
             </div>
         </div>
     </div>
@@ -288,46 +188,24 @@
         </div>
         <div class="modularThree">
             <div class="row">
+                @if (getArticlesBYCate(32,3)->isNotEmpty())
+                    @foreach (getArticlesBYCate(32,3) as $info)
                         <div class="publicHover col-md-4 col-xs-12">
                             <div class="modularThree-back">
-                        <div class="modularThree-name">区域地理学</div>
+                                <div class="modularThree-name">{{ $info->title }}</div>
                                 <div class="modularThree-list">
                                     <div class="ce-img modularThree-list-img">
                                         <!-- 图片比例（5:3） -->
-                                <span style="background-image: url(/assets/index/images/text/textImg_11.jpg);"></span>
+                                        <span style="background-image: url({{ $info->cover_url }});"></span>
                                     </div>
                                     <div class="ce-nowrap-multi modularThree-list-text">
-                                2002年4月11日上午，建投集团大数据公司、哈尔滨工程大学计算机学院、省科学院智能制造研
+                                        {{ $info->description }}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="publicHover col-md-4 col-xs-12">
-                    <div class="modularThree-back">
-                        <div class="modularThree-name">野生动物保护与利用学科</div>
-                        <div class="modularThree-list">
-                            <div class="ce-img modularThree-list-img">
-                                <span style="background-image: url(/assets/index/images/text/textImg_12.jpg);"></span>
-                            </div>
-                            <div class="ce-nowrap-multi modularThree-list-text">
-                                2002年4月11日上午，建投集团大数据公司、哈尔滨工程大学计算机学院、省科学院智能制造研
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="publicHover col-md-4 col-xs-12">
-                    <div class="modularThree-back">
-                        <div class="modularThree-name">火山学科</div>
-                        <div class="modularThree-list">
-                            <div class="ce-img modularThree-list-img">
-                                <span style="background-image: url(/assets/index/images/text/textImg_10.jpg);"></span>
-                            </div>
-                            <div class="ce-nowrap-multi modularThree-list-text">
-                                2002年4月11日上午，建投集团大数据公司、哈尔滨工程大学计算机学院、省科学院智能制造研
                                     </div>
                                 </div>
                             </div>
                         </div>
+                    @endforeach
+                @endif
             </div>
         </div>
     </div>
@@ -344,87 +222,35 @@
         </div>
         <div class="modularFive">
             <div class="row">
+                @if(getCateChild(5,3)->isNotEmpty())
+                    @foreach(getCateChild(5,3) as $cate)
                         <div class="col-md-4 col-xs-12">
                             <div class="modularFive-top">
-                        <span>国际合作平台</span>
+                                <span>{{ $cate->title }}</span>
                             </div>
                             <div class="modularThree-back">
                                 <div class="modularThree-list">
                                     <div class="ce-img modularFive-img">
                                         <!-- 图片比例（3:2） -->
-                                <span style="background-image: url(/assets/index/images/text/textImg_05.jpg);"></span>
+                                        <span style="background-image: url({{ $cate->cover_url }});"></span>
                                     </div>
                                     <ul class="modularFive-list">
-                                <li class="publicHover ce-nowrap-multi">
+                                        @if (getArticlesBYCate($cate->id,3)->isNotEmpty())
-                                    联合国教科文组织国际自然与文化遗产空间技术中心哈尔滨分中心
+                                            @foreach (getArticlesBYCate($cate->id,3) as $info)
-                                </li>
+                                                <li class="publicHover ce-nowrap-multi" data-href="{{ $info->link }}">
-                                <li class="publicHover ce-nowrap-multi">
+                                                    {{ $info->title }}
-                                    国际森林生物多样性检测网络寒温带森林样区
-                                </li>
-                                <li class="publicHover ce-nowrap-multi">
-                                    中国-俄罗斯生态联合创新研究中心
                                                 </li>
+                                            @endforeach
+                                        @endif
                                     </ul>
                                 </div>
-                        <div class="modularFive-more">
+                                <div class="modularFive-more" data-href="{{ $cate->link }}">
-                            <span>查看更多</span><img src="/assets/index/images/indexIcon/indexRow.png"/>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-4 col-xs-12">
-                    <div class="modularFive-top">
-                        <span>国家级平台</span>
-                    </div>
-                    <div class="modularThree-back">
-                        <div class="modularThree-list">
-                            <div class="ce-img modularFive-img">
-                                <!-- 图片比例（3:2） -->
-                                <span style="background-image: url(/assets/index/images/text/textImg_06.jpg);"></span>
-                            </div>
-                            <ul class="modularFive-list">
-                                <li class="publicHover ce-nowrap-multi">
-                                    联合国教科文组织国际自然与文化遗产空间技术中心哈尔滨分中心
-                                </li>
-                                <li class="publicHover ce-nowrap-multi">
-                                    国际森林生物多样性检测网络寒温带森林样区
-                                </li>
-                                <li class="publicHover ce-nowrap-multi">
-                                    中国-俄罗斯生态联合创新研究中心
-                                </li>
-                            </ul>
-                        </div>
-                        <div class="modularFive-more">
-                            <span>查看更多</span><img src="/assets/index/images/indexIcon/indexRow.png"/>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-4 col-xs-12">
-                    <div class="modularFive-top">
-                        <span>省级平台</span>
-                    </div>
-                    <div class="modularThree-back">
-                        <div class="modularThree-list">
-                            <div class="ce-img modularFive-img">
-                                <!-- 图片比例（3:2） -->
-                                <span style="background-image: url(/assets/index/images/text/textImg_07.jpg);"></span>
-                            </div>
-                            <ul class="modularFive-list">
-                                <li class="publicHover ce-nowrap-multi">
-                                    联合国教科文组织国际自然与文化遗产空间技术中心哈尔滨分中心
-                                </li>
-                                <li class="publicHover ce-nowrap-multi">
-                                    国际森林生物多样性检测网络寒温带森林样区
-                                </li>
-                                <li class="publicHover ce-nowrap-multi">
-                                    中国-俄罗斯生态联合创新研究中心
-                                </li>
-                            </ul>
-                        </div>
-                        <div class="modularFive-more">
                                     <span>查看更多</span><img src="/assets/index/images/indexIcon/indexRow.png"/>
                                 </div>
                             </div>
                         </div>
+                    @endforeach
+                @endif
             </div>
         </div>
     </div>
@@ -446,7 +272,7 @@
             <ul class="publicTab-ul">
                 <li role="presentation" class="active">
                     <img src="/assets/index/images/indexIcon/titleIcon_09.png"/>
-                    创新团队
+                    {{ getOneCategory(43,'title') }}
                 </li>
             </ul>
         </div>
@@ -454,141 +280,35 @@
             <div class="row">
                 <div class="col-md-4 col-xs-12">
                     <div class="modularThree-back">
+                        @if (getArticlesBYCate(43,3,1)->isNotEmpty())
+                            @foreach (getArticlesBYCate(43,3,1) as $info)
                                 <div class="ce-img modularSix-img">
                                     <!-- 图片比例（5:3） -->
-                            <span style="background-image: url(/assets/index/images/text/textImg_05.jpg);"></span>
+                                    <span style="background-image: url({{ $info->cover_url }});"></span>
-                            <div class="ce-nowrap modularThree-img-title">天然植物功能产物团队</div>
+                                    <div class="ce-nowrap modularThree-img-title">   {{ $info->title }}</div>
-                        </div>
-                        <div class="ce-img modularSix-img">
-                            <!-- 图片比例（5:3） -->
-                            <span style="background-image: url(/assets/index/images/text/textImg_06.jpg);"></span>
-                            <div class="ce-nowrap modularThree-img-title">寒地花卉创新团队</div>
-                        </div>
-                        <div class="ce-img modularSix-img">
-                            <!-- 图片比例（5:3） -->
-                            <span style="background-image: url(/assets/index/images/text/textImg_07.jpg);"></span>
-                            <div class="ce-nowrap modularThree-img-title">湿地生态与恢复创新团队</div>
                                 </div>
+                            @endforeach
+                        @endif
                     </div>
                 </div>
                 <div class="col-md-8 col-xs-12">
                     <div class="modularThree-back modularSix-space">
                         <div class="row">
+                            @if (getArticlesBYCate(43,14)->isNotEmpty())
+                                @foreach (getArticlesBYCate(43,14) as $info)
                                     <div class="col-md-4 col-xs-12 modularSix-padding">
                                         <div class="modularSix-label">
                                             <div class="modularSix-label-cont">
-                                        <img src="/assets/index/images/indexIcon/titleTem_00.png"/>
+                                                <img src="{{ $info->logo_url }}"/>
-                                        <span>湿地生态与恢复</span>
+                                                <span>{{ $info->title }}</span>
                                             </div>
                                         </div>
                                     </div>
+                                @endforeach
+                            @endif
                             <div class="col-md-4 col-xs-12 modularSix-padding">
                                 <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
+                                    <div class="modularSix-label-cont" data-href="{{ getOneCategory(43,'link') }}">
-                                        <img src="/assets/index/images/indexIcon/titleTem_01.png"/>
-                                        <span>湿地植物分子生态</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-4 col-xs-12 modularSix-padding">
-                                <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
-                                        <img src="/assets/index/images/indexIcon/titleTem_02.png"/>
-                                        <span>寒温带森林<br/>生物多样性保育</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-4 col-xs-12 modularSix-padding">
-                                <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
-                                        <img src="/assets/index/images/indexIcon/titleTem_03.png"/>
-                                        <span>火山植被生<br/>态协同进化</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-4 col-xs-12 modularSix-padding">
-                                <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
-                                        <img src="/assets/index/images/indexIcon/titleTem_04.png"/>
-                                        <span>智能生物多样性</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-4 col-xs-12 modularSix-padding">
-                                <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
-                                        <img src="/assets/index/images/indexIcon/titleTem_05.png"/>
-                                        <span>特色经济植物</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-4 col-xs-12 modularSix-padding">
-                                <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
-                                        <img src="/assets/index/images/indexIcon/titleTem_06.png"/>
-                                        <span>天然植物功能产物</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-4 col-xs-12 modularSix-padding">
-                                <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
-                                        <img src="/assets/index/images/indexIcon/titleTem_07.png"/>
-                                        <span>寒地花卉</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-4 col-xs-12 modularSix-padding">
-                                <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
-                                        <img src="/assets/index/images/indexIcon/titleTem_08.png"/>
-                                        <span>功能性园林植物</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-4 col-xs-12 modularSix-padding">
-                                <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
-                                        <img src="/assets/index/images/indexIcon/titleTem_09.png"/>
-                                        <span>保护动物保育</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-4 col-xs-12 modularSix-padding">
-                                <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
-                                        <img src="/assets/index/images/indexIcon/titleTem_10.png"/>
-                                        <span>自然遗产保护</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-4 col-xs-12 modularSix-padding">
-                                <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
-                                        <img src="/assets/index/images/indexIcon/titleTem_11.png"/>
-                                        <span>自然资源效应</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-4 col-xs-12 modularSix-padding">
-                                <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
-                                        <img src="/assets/index/images/indexIcon/titleTem_12.png"/>
-                                        <span>火山矿泉</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-4 col-xs-12 modularSix-padding">
-                                <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
-                                        <img src="/assets/index/images/indexIcon/titleTem_13.png"/>
-                                        <span>火山矿泥</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-4 col-xs-12 modularSix-padding">
-                                <div class="modularSix-label">
-                                    <div class="modularSix-label-cont">
                                         <img src="/assets/index/images/indexIcon/titleTem_14.png"/>
                                         <span>查看更多 &gt;&gt;</span>
                                     </div>
@@ -618,11 +338,11 @@
                     </div>
                     <div class="modularThree-back modularSix-space">
                         <div class="row">
-                            @if (getArticlesBYCate(74,6)->isNotEmpty())
+                            @if(getCateChild(42)->isNotEmpty())
-                                @foreach (getArticlesBYCate(74,6) as $info)
+                                @foreach(getCateChild(42) as $cate)
                                     <div class="col-xs-12 col-md-4 modularSix-padding">
-                                        <div class="modularServe-label" data-href="{{ $article->link }}">
+                                        <div class="modularServe-label">
-                                            <span>{{ $info->title }}</span>
+                                            <span> {{ $cate->title }}</span>
                                         </div>
                                     </div>
                                 @endforeach
@@ -643,8 +363,8 @@
                     <div class="modularThree-back">
                         <ul class="modularServe-list">
                             @if (getArticlesBYCate(27,5)->isNotEmpty())
-                                @foreach (getArticlesBYCate(74,5) as $info)
+                                @foreach (getArticlesBYCate(27,5) as $info)
-                                    <li data-href="{{ $article->link }}">
+                                    <li data-href="{{ $info->link }}">
                                         <div class="ce-nowrap publicHover modularServe-name">
                                             {{ $info->title }}
                                         </div>
@@ -662,30 +382,16 @@
     <div class="container">
         <div class="modularEight">
             <div class="row">
+                @if(getCateChild(68))
+                    @foreach(getCateChild(68) as $cate)
                         <div class="col-xs-12 col-md-3">
                             <div class="modularEight-label"
-                         style="background-image: url('/assets/index/images/indexLabel_00.jpg');">
+                                 style="background-image: url({{ $cate->cover_url }});">
-                        <div class="modularEight-title">国家博士后工作站</div>
+                                <div class="modularEight-title">{{ $cate->title }}</div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-md-3">
-                    <div class="modularEight-label"
-                         style="background-image: url(/assets/index/images/indexLabel_01.jpg);">
-                        <div class="modularEight-title">科学传播</div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-md-3">
-                    <div class="modularEight-label"
-                         style="background-image: url(/assets/index/images/indexLabel_02.jpg);">
-                        <div class="modularEight-title">黑龙江省生物多样性<br/>基础信息系统</div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-md-3">
-                    <div class="modularEight-label"
-                         style="background-image: url(/assets/index/images/indexLabel_03.jpg);">
-                        <div class="modularEight-title">人才招聘</div>
                             </div>
                         </div>
+                    @endforeach
+                @endif
             </div>
         </div>
     </div>
@@ -705,6 +411,13 @@
                     $('.Rightfixed-img').css("width", "48px");
                 }
             );
+
+            $('.new_list').click(function () {
+                var link = $(this).data('link');
+
+                $('.new_list_more').attr('data-href', link)
             });
+        });
+
     </script>
 @endpush

resources/views/layouts/pagination.blade.php

@@ -1,18 +1,19 @@
 @if ($paginator->hasPages())
-    <form action="{{ url()->current() }}" method="get" accept-charset="utf-8">
+    <ul class="pagination">
-        <div class="tcdPageCode">
-            {{-- Previous Page Link --}}
         @if ($paginator->onFirstPage())
-                <span class="disabled">上一页</span>
+            <li class="disabled"><a href="#"><span aria-hidden="true">上一页</span></a></li>
         @else
-                <a href="{{ $paginator->previousPageUrl() }}" class="prevPage">上一页</a>
+            <li>
+                <a href="{{ $paginator->previousPageUrl() }}" aria-label="Previous">
+                    <span aria-hidden="true">上一页</span>
+                </a>
+            </li>
         @endif
-
-            {{-- Pagination Elements --}}
         @foreach ($elements as $element)
             {{-- "Three Dots" Separator --}}
             @if (is_string($element))
-                    <li class="page-item disabled" aria-disabled="true"><span class="page-link">{{ $element }}</span>
+                <li class="page-item disabled" aria-disabled="true">
+                    <span class="page-link">{{ $element }}</span>
                 </li>
             @endif
 
@@ -20,24 +21,19 @@
             @if (is_array($element))
                 @foreach ($element as $page => $url)
                     @if ($page == $paginator->currentPage())
-                            <span class="current">{{ $page }}</span>
+                        <li class="active"><a href="#">{{ $page }} <span class="sr-only">(current)</span></a></li>
                     @else
-                            <a href="{{ $url }}" class="tcdNumber">{{ $page }}</a>
+                        <li><a href="{{ $url }}">{{ $page }} </a></li>
                     @endif
                 @endforeach
             @endif
         @endforeach
-
-            {{-- Next Page Link --}}
         @if ($paginator->hasMorePages())
-                <a href="{{ $paginator->nextPageUrl() }}" class="nextPage">下一页</a>
+            <li><a href="{{ $paginator->nextPageUrl() }}" aria-label="Next"><span aria-hidden="true">下一页</span></a></li>
         @else
-                <span class="disabled">下一页</span>
+            <li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">下一页</span></a></li>
         @endif
-            {{--            <li class="page-item disabled" aria-disabled="true">--}}
-            {{--                <span class="page-link" aria-hidden="true">共{{ $paginator->total() }}条</span>--}}
-            {{--            </li>--}}
 
-        </div>
+    </ul>
-    </form>
+
 @endif