From 526c433ed6a277f86180cf4192fa991e1b81c383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=84=E5=B0=98?= <122383162@qq.com>
Date: Thu, 17 Mar 2022 11:20:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/index/css/style.css        |   2 +-
 resources/views/category/djwh.blade.php  |   4 +-
 resources/views/index/index.blade.php    | 100 ++++++------
 resources/views/layouts/header.blade.php | 200 +++++++++++------------
 4 files changed, 154 insertions(+), 152 deletions(-)

diff --git a/public/assets/index/css/style.css b/public/assets/index/css/style.css
index 0a8122d..264dd1e 100644
--- a/public/assets/index/css/style.css
+++ b/public/assets/index/css/style.css
@@ -416,7 +416,7 @@ body {
     font-size: 16px;
 }
 
-.indexImg-pagination, .indexNews-pagination {
+.indexImg-pagination, .indexNews-pagination, .indexGg-pagination {
     text-align: right !important;
     padding-right: 20px!important;
     bottom: 16px!important;
diff --git a/resources/views/category/djwh.blade.php b/resources/views/category/djwh.blade.php
index ccb21f0..53aadc4 100644
--- a/resources/views/category/djwh.blade.php
+++ b/resources/views/category/djwh.blade.php
@@ -34,8 +34,8 @@
                                 @endforeach
                             @endif
                             <ul class="srRrends-list">
-                                @if (getArticlesBYCate(79,2)->isNotEmpty())
-                                    @foreach (getArticlesBYCate(79,2) as $info)
+                                @if (getArticlesBYCate(79,3)->isNotEmpty())
+                                    @foreach (getArticlesBYCate(79,3) as $info)
                                         <li data-href="{{ $info->link }}" class="publicHover">
 
                                             <div class="srRrends-list-cont">
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index 758ee4a..fd7549c 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -35,7 +35,7 @@
                 <div class="row">
                     @if ($ysxw->isNotEmpty())
                         <div class="col-md-6 col-xs-12">
-                            <div class="swiper-container indexBig">
+                            <div class="swiper-container newNdexBig indexBig">
                                 <div class="swiper-wrapper">
                                     @foreach ($ysxw as $info)
                                         <div class="swiper-slide">
@@ -72,24 +72,24 @@
             <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="swiper-container indexNew">
-                                <div class="swiper-wrapper">
-                                    @foreach (getArticlesBYCate(67,5) as $info)
-                                        <div class="swiper-slide">
-                                            <div class="indexNew-img ce-img">
-                                                <span style="background-image: url({{ $info->cover_url }});"></span>
-                                                <div class="ce-nowrap indexImg-title">
-                                                    {{ $info->title }}
-                                                </div>
-                                            </div>
-                                        </div>
-                                    @endforeach
-                                </div>
-                                <!-- Add Pagination -->
-                                <div class="swiper-pagination indexImg-pagination indexNew-pagination"></div>
-                            </div>
-                        </div>
+						<div class="col-md-6 col-xs-12">
+						    <div class="swiper-container newGgBig indexBig">
+						        <div class="swiper-wrapper">
+						            @foreach (getArticlesBYCate(67,5) as $info)
+						                <div class="swiper-slide">
+						                    <div class="indexNew-img ce-img">
+						                        <span style="background-image: url({{ $info->cover_url}});"></span>
+						                        <div class="ce-nowrap indexImg-title">
+						                            {{ $info->title }}
+						                        </div>
+						                    </div>
+						                </div>
+						            @endforeach
+						        </div>
+						        <!-- Add Pagination -->
+						        <div class="swiper-pagination indexGg-pagination"></div>
+						    </div>
+						</div>
                         <div class="col-md-6 col-xs-12">
                             <ul class="indexNew-list">
                                 @foreach (getArticlesBYCate(67,7) as $info)
@@ -420,51 +420,53 @@
                             <div class="col-xs-12 col-md-3"
                                  @if($cate->url && $cate->type=='link')
                                  data-href="{{ $cate->url }}"
-                                    @endif
-                            />
-                            <div class="modularEight-label"
-                                 style="background-image: url({{ $cate->cover_url }});">
-                                <div class="modularEight-title">{{ $cate->title }}</div>
+                                    @endif >
+                                <div class="modularEight-label"
+                                     style="background-image: url({{ $cate->cover_url }});">
+                                    <div class="modularEight-title">{{ $cate->title }}</div>
+                                </div>
                             </div>
+                        @endforeach
+                    @endif
                 </div>
-                @endforeach
-                @endif
             </div>
         </div>
     </div>
-
 @endsection
 
 @push('script')
-    <script type="text/javascript" src="{{ asset('assets/index/js/swiper.min.js') }}"></script>
+	<script type="text/javascript" src="{{ asset('assets/index/js/swiper.min.js') }}"></script>
     <script type="text/javascript">
-        // 新闻轮播
-        var banner = new Swiper('.indexBig', {
-            pagination: '.indexImg-pagination',
-            paginationClickable: true,
-            spaceBetween: 30,
-            centeredSlides: true,
-            autoplay: 6000,
-            autoplayDisableOnInteraction: false
-        });
-
-        // 公告轮播
-        var banner = new Swiper('.indexNew', {
-            pagination: '.indexNew-pagination',
-            paginationClickable: true,
-            spaceBetween: 30,
-            centeredSlides: true,
-            autoplay: 6000,
-            autoplayDisableOnInteraction: false
-        });
-
+		
         $(document).ready(function () {
             $('.new_list').click(function () {
                 var link = $(this).data('link');
 
                 $('.new_list_more').attr('data-href', link)
             });
+			
+			// 新闻轮播
+			var banner = new Swiper('.newNdexBig', {
+			    pagination: '.indexImg-pagination',
+			    paginationClickable: true,
+			    spaceBetween: 30,
+			    centeredSlides: true,
+			    autoplay: 5000,
+			    autoplayDisableOnInteraction: false
+			});
         });
-
+		
+		$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+			if(e.currentTarget.id === 'relationTab-02'){
+				// 公告轮播
+				var swiper = new Swiper('.newGgBig', {
+				    pagination: 'indexGg-pagination',
+				    paginationClickable: true,
+				    centeredSlides: true,
+				    autoplay: 5000,
+				    autoplayDisableOnInteraction: false
+				});
+			}
+		})
     </script>
 @endpush
diff --git a/resources/views/layouts/header.blade.php b/resources/views/layouts/header.blade.php
index 99ee381..948166d 100644
--- a/resources/views/layouts/header.blade.php
+++ b/resources/views/layouts/header.blade.php
@@ -1,100 +1,100 @@
-<!-- 微信漂浮窗 -->
-{{--<div class="Rightfixed">--}}
-{{--    <div class="Rightfixed-img">--}}
-{{--        <img class="Rightfixed-img-code" src="/assets/index/images/wxFixed.png"/>--}}
-{{--        <img src="/assets/index/images/wxImg.png" class="Rightfixed-pop">--}}
-{{--    </div>--}}
-{{--</div>--}}
-<!-- 头部 -->
-<div class="navTop">
-    <div class="container">
-        <div class="row">
-            <div class="col-xs-12 col-md-12">
-                <span data-href="#">联系我们</span> /
-                <span data-href="#">网站地图</span> /
-                <span data-href="#">电子邮箱</span>
-            </div>
-        </div>
-    </div>
-</div>
-
-<!-- 导航 -->
-<div class="container">
-    <div class="navHead">
-        <div class="row">
-            <div class="col-md-8 col-xs-12">
-                <img data-href="/" src="/assets/index/images/logo.png"/>
-            </div>
-            <div class="col-md-4 col-xs-12">
-                <form action="{{ route('index.search') }}">
-
-                    <div class="navHead-search">
-                        <input type="text" name="title" placeholder="输入关键字搜索">
-                        <button class="navHead-logo"><img src="/assets/index/images/search_Icon.png"/></button>
-                    </div>
-                </form>
-            </div>
-
-        </div>
-    </div>
-</div>
-
-<!-- banner -->
-<div class="container">
-    <div class="banner">
-        <div class="row">
-            <div class="col-md-12 col-xs-12">
-                <div class="swiper-container indexBig">
-                    <div class="swiper-wrapper">
-                        @foreach (getAdvertsByCate(34,3) as $info)
-                            <div class="swiper-slide">
-                                <div class="indexNew-img ce-img" style="padding-top: 16%">
-                                    <span style="background-image: url({{ $info->cover_url }});"></span>
-                                </div>
-                            </div>
-                        @endforeach
-                    </div>
-                    <!-- Add Pagination -->
-                    <!-- <div class="swiper-pagination indexImg-pagination"></div> -->
-                </div>
-            </div>
-
-            <div class="col-md-12 col-xs-12">
-                <ul class="banner-nav">
-                    <li data-href="/" @if (!isset($parent)) class="active" @endif>首页</li>
-                    @php
-                        $top_ids =[];
-                        if (isset($parent)) {
-                           if (!is_array($parent)) {
-                                 $top_ids = [$parent->id];
-                            }else{
-                              $top_ids = $parent;
-                            }
-                        }
-                    @endphp
-                    @foreach ($all_categorys as $cate)
-                        <li @if (in_array($cate->id,$top_ids)) class="active" @endif data-href="{{ $cate->link }}">
-                            {{ $cate->title }}
-                        </li>
-                    @endforeach
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-@push('script')
-    <script type="text/javascript" src="{{ asset('assets/index/js/swiper.min.js') }}"></script>
-    <script type="text/javascript">
-        // 新闻轮播
-        var banner = new Swiper('.indexBig', {
-            pagination: '.indexImg-pagination',
-            paginationClickable: true,
-            spaceBetween: 30,
-            centeredSlides: true,
-            autoplay: 3000,
-            autoplayDisableOnInteraction: false
-        });
-    </script>
-@endpush
+<!-- 微信漂浮窗 -->
+{{--<div class="Rightfixed">--}}
+{{--    <div class="Rightfixed-img">--}}
+{{--        <img class="Rightfixed-img-code" src="/assets/index/images/wxFixed.png"/>--}}
+{{--        <img src="/assets/index/images/wxImg.png" class="Rightfixed-pop">--}}
+{{--    </div>--}}
+{{--</div>--}}
+<!-- 头部 -->
+<div class="navTop">
+    <div class="container">
+        <div class="row">
+            <div class="col-xs-12 col-md-12">
+                <span data-href="#">联系我们</span> /
+                <span data-href="#">网站地图</span> /
+                <span data-href="#">电子邮箱</span>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- 导航 -->
+<div class="container">
+    <div class="navHead">
+        <div class="row">
+            <div class="col-md-8 col-xs-12">
+                <img data-href="/" src="/assets/index/images/logo.png"/>
+            </div>
+            <div class="col-md-4 col-xs-12">
+                <form action="{{ route('index.search') }}">
+
+                    <div class="navHead-search">
+                        <input type="text" name="title" placeholder="输入关键字搜索">
+                        <button class="navHead-logo"><img src="/assets/index/images/search_Icon.png"/></button>
+                    </div>
+                </form>
+            </div>
+
+        </div>
+    </div>
+</div>
+
+<!-- banner -->
+<div class="container">
+    <div class="banner">
+        <div class="row">
+            <div class="col-md-12 col-xs-12">
+                <div class="swiper-container indexTopBig indexBig">
+                    <div class="swiper-wrapper">
+                        @foreach (getAdvertsByCate(34,3) as $info)
+                            <div class="swiper-slide">
+                                <div class="indexNew-img ce-img" style="padding-top: 16%">
+                                    <span style="background-image: url({{ $info->cover_url }});"></span>
+                                </div>
+                            </div>
+                        @endforeach
+                    </div>
+                    <!-- Add Pagination -->
+                    <!-- <div class="swiper-pagination indexImg-pagination"></div> -->
+                </div>
+            </div>
+
+            <div class="col-md-12 col-xs-12">
+                <ul class="banner-nav">
+                    <li data-href="/" @if (!isset($parent)) class="active" @endif>首页</li>
+                    @php
+                        $top_ids =[];
+                        if (isset($parent)) {
+                           if (!is_array($parent)) {
+                                 $top_ids = [$parent->id];
+                            }else{
+                              $top_ids = $parent;
+                            }
+                        }
+                    @endphp
+                    @foreach ($all_categorys as $cate)
+                        <li @if (in_array($cate->id,$top_ids)) class="active" @endif data-href="{{ $cate->link }}">
+                            {{ $cate->title }}
+                        </li>
+                    @endforeach
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+@push('script')
+    <script type="text/javascript" src="{{ asset('assets/index/js/swiper.min.js') }}"></script>
+    <script type="text/javascript">
+        // 新闻轮播
+        var banner = new Swiper('.indexTopBig', {
+            paginationClickable: true,
+            spaceBetween: 30,
+            centeredSlides: true,
+            autoplay: 5000,
+            autoplayDisableOnInteraction: false,
+			loop: true
+        });
+    </script>
+@endpush