From 0421d943bcabc5b5ccdf925b0dd932509b5bd1d9 Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Thu, 25 Mar 2021 16:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/category/kxyj.blade.php   |   2 +-
 resources/views/category/rcdw.blade.php   |   2 +-
 resources/views/category/xwdt.blade.php   |   4 +-
 resources/views/index/index.blade.php     |   4 +-
 resources/views/index/index.blade_old.php | 299 ----------------------
 5 files changed, 6 insertions(+), 305 deletions(-)
 delete mode 100644 resources/views/index/index.blade_old.php

diff --git a/resources/views/category/kxyj.blade.php b/resources/views/category/kxyj.blade.php
index a2e2305..06bdb61 100644
--- a/resources/views/category/kxyj.blade.php
+++ b/resources/views/category/kxyj.blade.php
@@ -13,7 +13,7 @@
                         <div class="secondTop">
                             <div class="secondTop-name">
                                 <img src="/assets/index/images/studyIcon_00.png"/>
-                                {{ $category->title }}
+                                {{ getOneCategory(8,'title') }}
                             </div>
                         </div>
                         <ul class="indexTeam-ul studyDynamic">
diff --git a/resources/views/category/rcdw.blade.php b/resources/views/category/rcdw.blade.php
index 4da872c..3fb4eed 100644
--- a/resources/views/category/rcdw.blade.php
+++ b/resources/views/category/rcdw.blade.php
@@ -13,7 +13,7 @@
                         <div class="secondTop">
                             <div class="secondTop-name">
                                 <img src="/assets/index/images/armyIcon_00.png"/>
-                                {{ $category->title }}
+                                {{ getOneCategory(27,'title') }}
                             </div>
                         </div>
                         <div class="swiper-container innovate-swiper">
diff --git a/resources/views/category/xwdt.blade.php b/resources/views/category/xwdt.blade.php
index 1b2fd37..3fb16b3 100644
--- a/resources/views/category/xwdt.blade.php
+++ b/resources/views/category/xwdt.blade.php
@@ -14,7 +14,7 @@
                         <div class="secondTop">
                             <div class="secondTop-name">
                                 <img src="/assets/index/images/newsIcon_00.png"/>
-                                {{ $category->title }}
+                                {{ getOneCategory(7,'title') }}
                             </div>
                         </div>
                         <ul class="newBranch">
@@ -45,7 +45,7 @@
                             @endif
                         </ul>
                         <div class="secondMore">
-                            <a href="{{ $category->link }}">查看更多&gt;</a>
+                            <a href="{{ getOneCategory(7,'link') }}">查看更多&gt;</a>
                         </div>
                     </div>
 
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index 42a03c4..51a0e81 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -110,8 +110,8 @@
                             </div>
                             <div class="swiper-container indexBuild-swiper">
                                 <div class="swiper-wrapper">
-                                    @if (getArticlesBYCate(27,8)->isNotEmpty())
-                                        @foreach (getArticlesBYCate(27,8) as $article)
+                                    @if (getArticlesBYCate(28,8)->isNotEmpty())
+                                        @foreach (getArticlesBYCate(28,8) as $article)
                                             <div class="swiper-slide">{{ $article->title }}
                                                 <span>{{ $article->description }}</span>
                                             </div>
diff --git a/resources/views/index/index.blade_old.php b/resources/views/index/index.blade_old.php
deleted file mode 100644
index 346df75..0000000
--- a/resources/views/index/index.blade_old.php
+++ /dev/null
@@ -1,299 +0,0 @@
-@extends('layouts.app')
-
-@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="{{ getOneAdvertByCate(20,'cover_path') }}">
-                <div class="news-hot-text">
-                    <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(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(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 }}
-                                </a>
-                            </li>
-                        @endforeach
-                    @endif
-                </ul>
-            </div>
-        </div>
-        <!-- 科研动态 -->
-        <div class="dynamic">
-            <div class="mian-title">
-                <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(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">
-                                <h3 class="nowrap"><a href="{{ $article->link }}">{{ $article->title }}</a></h3>
-                                <p class="nowrap-multi">{{ $article->description }}</p>
-                            </div>
-                        </li>
-                    @endforeach
-                @endif
-
-            </ul>
-        </div>
-        <!-- 广告条 -->
-        <div class="index-ad">
-            <a href="{{ getOneAdvertByCate(21,'url') }}">
-                <img src="{{ getOneAdvertByCate(21,'cover_path') }}">
-            </a>
-        </div>
-
-        <!-- 党团生活, 精神文明 -->
-        <div class="news">
-            <div class="news-item party">
-                <div class="tabs-title" id="information">
-                    {{--                    党政建设--}}
-                    <span class="tabs-item show">{{ getOneCategory(4,'title') }}</span>
-                    {{--                    媒体报道--}}
-                    <span class="tabs-item"> {{ getOneCategory(17,'title') }}</span>
-                </div>
-                <div class="tabs-content-wrapper" id="informationContent">
-                    <!-- 国内资讯 -->
-                    <ul class="party-ul tabs-content active">
-                        @if (getArticlesBYCate(4,3)->isNotEmpty())
-                            @foreach (getArticlesBYCate(4,3) as $article)
-                                <li class="party-ul-li">
-                                    <a href="{{ $article->link }}">
-                                        <span class="party-time">
-                                            <h3>{{ $article->created_at->format('d') }}</h3>
-                                            <p>{{ $article->created_at->format('Y-m') }}</p>
-                                        </span>
-                                        <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">
-                        @if (getArticlesBYCate(17,12)->isNotEmpty())
-                            @foreach (getArticlesBYCate(17,12) as $article)
-                                <li class="party-ul-li">
-                                    <a href="{{ $article->link }}">
-                                        <span class="party-time">
-                                            <h3>{{ $article->created_at->format('d') }}</h3>
-                                            <p>{{ $article->created_at->format('Y-m') }}</p>
-                                        </span>
-                                        <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>{{ getOneCategory(5,'title') }}</b>
-                    <span>/&nbsp;&nbsp;<!-- {{ getOneCategory(5,'description') }} -->Exchange and cooperation</span>
-                    <a class="mian-title-more" href="{{ getOneCategory(5,'link') }}">更多<i class="fa fa-angle-right"></i></a>
-                </div>
-                <ul class="spiritual-ul">
-                    @if (getArticlesBYCate(5,3)->isNotEmpty())
-                        @foreach (getArticlesBYCate(5,3) 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">{{ $article->description }}</p>
-                                </a>
-                            </li>
-                        @endforeach
-                    @endif
-                </ul>
-            </div>
-        </div>
-        <!-- 广告条 -->
-        <div class="index-ad">
-            <a href="{{ getOneAdvertByCate(22,'url') }}">
-                <img src="{{ getOneAdvertByCate(22,'cover_path') }}">
-            </a>
-        </div>
-        <!-- 新闻列表 -->
-        <div class="news">
-            <!-- tabs -->
-            <div class="news-item party">
-                <div class="tabs-title" id="newsTab">
-                    <span class="tabs-item show">{{ getOneCategory(27,'title') }}</span>
-                    <span class="tabs-item">{{ getOneCategory(28,'title') }}</span>
-                    <span class="tabs-item">{{ getOneCategory(29,'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">
-                        @if (getArticlesBYCate(27,4)->isNotEmpty())
-                            @foreach (getArticlesBYCate(27,4) as $article)
-                                <li class="party-ul-li">
-                                    <a href="{{ $article->link }}">
-    									<span class="party-img">
-    										<!-- <h3>{{ $article->created_at->format('d') }}</h3>
-    										<p>{{ $article->created_at->format('Y-m') }}</p> -->
-    									</span><span class="party-img party-cover" style="background-image:url({{ $article->cover_path }})">
-                                        </span>
-                                        <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">
-                        @if (getArticlesBYCate(28,4)->isNotEmpty())
-                            @foreach (getArticlesBYCate(28,4) as $article)
-                                <li class="party-ul-li">
-                                    <a href="{{ $article->link }}">
-    									<span class="party-img party-cover" style="background-image:url({{ $article->cover_path }})">
-    									</span>
-                                        <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">
-                        @if (getArticlesBYCate(29,4)->isNotEmpty())
-                            @foreach (getArticlesBYCate(29,4) as $article)
-                                <li class="party-ul-li">
-                                    <a href="{{ $article->link }}">
-    									<span class="party-img party-cover" style="background-image:url({{ $article->cover_path }})">
-    									</span>
-                                        <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="tabs-title" id="patentTab">
-                    <span class="tabs-item show">{{ getOneCategory(18,'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="patentTabContent">
-                    <!-- 项目推广 -->
-                    <ul class="spiritual-ul tabs-content active">
-                        @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">{{ $article->description }}</p>
-                                    </a>
-                                </li>
-                            @endforeach
-                        @endif
-                    </ul>
-
-                    <!-- 成果专利 -->
-                    <ul class="spiritual-ul tabs-content">
-                        @if (getArticlesBYCate(16,4)->isNotEmpty())
-                            @foreach (getArticlesBYCate(16,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">{{ $article->description }}</p>
-                                    </a>
-                                </li>
-                            @endforeach
-                        @endif
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-    <!-- end mian -->
-@endsection
-
-@push('script')
-    <script type="text/javascript">
-        // swiperBanner
-        var swiperBanner = new Swiper("#swiperBanner", {
-            autoplay: 5000,
-            loop: true,
-            slidesPerView: 'auto',
-            pagination: ".swiper-pagination",
-            paginationClickable: true,
-            autoplayDisableOnInteraction: false
-        })
-
-        // 新闻列表
-        $(function () {
-            $('#newsTab .tabs-item').hover(function () {
-                $(this).addClass("show").siblings().removeClass("show")
-                $("#newsTabContent .tabs-content").eq($(this).index()).addClass("active").siblings().removeClass("active")
-            })
-        });
-
-        // 国内国际资讯
-        $(function () {
-            $('#information .tabs-item').hover(function () {
-                $(this).addClass("show").siblings().removeClass("show")
-                $("#informationContent .tabs-content").eq($(this).index()).addClass("active").siblings().removeClass("active")
-            })
-        });
-
-        //项目推广
-        $(function () {
-            $('#patentTab .tabs-item').hover(function () {
-                $(this).addClass("show").siblings().removeClass("show")
-                $("#patentTabContent .tabs-content").eq($(this).index()).addClass("active").siblings().removeClass("active")
-            })
-        });
-
-    </script>
-@endpush