From 41ed17d0fec9e2421310806cbe5751586425035f Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Tue, 11 Jan 2022 10:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/category/djwh.blade.php   | 39 +++++++++++++++
 resources/views/category/videos.blade.php | 59 ++++++++++++++++++++---
 resources/views/category/ysxw.blade.php   | 46 ++++++++++++++++++
 resources/views/layouts/footer.blade.php  |  6 +--
 4 files changed, 140 insertions(+), 10 deletions(-)
 create mode 100644 resources/views/category/ysxw.blade.php

diff --git a/resources/views/category/djwh.blade.php b/resources/views/category/djwh.blade.php
index 31913ca..ccb21f0 100644
--- a/resources/views/category/djwh.blade.php
+++ b/resources/views/category/djwh.blade.php
@@ -14,6 +14,45 @@
         <!-- 右侧内容部分 -->
             <div class="col-xs-12 col-md-9">
                 <div class="levelRight">
+                    <!-- start 党建文化概况 -->
+                    <div class="partyBuild briefMargin">
+                        <div class="party-title">
+                            <span>{{ getOneCategory(79,'title') }}</span>
+                            <div class="party-title-more" data-href="{{ getOneCategory(79,'link') }}">更多&gt;&gt;</div>
+                        </div>
+
+                        <div class="srRrendText">
+                            @if (getHasCoverArticlesByCate(79,1)->isNotEmpty())
+                                @foreach (getHasCoverArticlesByCate(79,1) as $info)
+                                    <div class="ce-img srRrends-list-img" data-href="{{ $info->link }}">
+                                        <!-- 图片为4:3 -->
+                                        <span style="background-image: url({{ $info->cover_url }});"></span>
+                                        <div class="ce-nowrap indexImg-title">
+                                            {{ $info->title }}
+                                        </div>
+                                    </div>
+                                @endforeach
+                            @endif
+                            <ul class="srRrends-list">
+                                @if (getArticlesBYCate(79,2)->isNotEmpty())
+                                    @foreach (getArticlesBYCate(79,2) as $info)
+                                        <li data-href="{{ $info->link }}" class="publicHover">
+
+                                            <div class="srRrends-list-cont">
+                                                <div class="srRrends-list-text">
+                                                    <div class="ce-nowrap-multi srRrends-list-name">
+                                                        {{ $info->title }}
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </li>
+                                    @endforeach
+                                @endif
+                            </ul>
+                        </div>
+                    </div>
+                    <!-- end 党建文化概况 -->
+
                     <!-- start 党团活动 -->
                     <div class="partyActivity">
                         <div class="party-title">
diff --git a/resources/views/category/videos.blade.php b/resources/views/category/videos.blade.php
index 2d838c7..ff9c848 100644
--- a/resources/views/category/videos.blade.php
+++ b/resources/views/category/videos.blade.php
@@ -2,6 +2,10 @@
 
 @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')
@@ -11,11 +15,49 @@
         <div class="row">
             <!-- 左侧导航部分 -->
         @include('category.left')
+
         <!-- 右侧内容部分 -->
-            <div class="col-xs-12 col-md-9">
-                <div class="briefVideo">
-                    <div class="briefAlbum-title" style="margin-bottom: 10px"><span>党建风采</span></div>
-                    <div class="briefVideo-cont">
+            <div class="briefVideo">
+                <div class="briefAlbum-title" style="margin-bottom: 10px"><span>党建风采</span></div>
+            </div>
+
+            @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->link_url }}">
+                                            <span style="background-image: url({{ $article->cover_url }});"></span>
+                                            <img class="videoImg-icon"
+                                                 src="/assets/index/images/srIcon/srSpread_icon_list.png"/>
+                                        </div>
+                                        <div class="videoText">
+                                            <p class="ce-nowrap">{{ $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 class="briefVideo-cont">
                         <div class="briefVideo-tips">
                             <span>党建风采宣传视频</span>
                         </div>
@@ -26,9 +68,12 @@
                             >
                             </video>
                         </div>
-                    </div>
-                </div>
-            </div>
+                    </div> -->
+
         </div>
     </div>
 @endsection
+
+@push('script')
+    <script type="text/javascript" src="{{ asset('assets/index/js/pingzi_video.js') }}"></script>
+@endpush
diff --git a/resources/views/category/ysxw.blade.php b/resources/views/category/ysxw.blade.php
new file mode 100644
index 0000000..26c1a12
--- /dev/null
+++ b/resources/views/category/ysxw.blade.php
@@ -0,0 +1,46 @@
+@extends('layouts.app')
+
+@section('title', '院所新闻')
+
+@section('content')
+
+    <!-- 面包屑导航 -->
+    @include('category.navigation')
+
+    <!-- 内容 -->
+    <div class="container">
+        <div class="row">
+            <!-- 左侧导航部分 -->
+        @include('category.left')
+        <!-- 右侧内容部分 -->
+            @if ($articles->isNotEmpty())
+                <div class="col-xs-12 col-md-9">
+                    <ul class="indexExtend-ul studyExtend">
+                        @foreach ($articles as $article)
+                            <li data-href="{{ $article->link }}" class="publicHover">
+                                <div class="ce-nowrap indexExtend-ul-name">
+                                   <div style="padding-right: 30px; display: inline-block; color: #666">{{ $article->created_at->format('Y-m-d') }}</div>{{ $article->title }}
+                                </div>
+                                <div class="ce-nowrap-multi indexExtend-ul-text">
+                                    {{ $article->description }}
+                                </div>
+                            </li>
+                        @endforeach
+                    </ul>
+                    <div class="pageUl">
+                        @if ($articles->isNotEmpty())
+                            {{ $articles->links('layouts.pagination') }}
+                        @endif
+                    </div>
+                </div>
+            @else
+                <div class="col-md-12 col-md-9">
+                    <div class="no-searchCont">
+                        <img src="/assets/index/images/org55.png"/>
+                        <span>抱歉，暂无内容</span>
+                    </div>
+                </div>
+            @endif
+        </div>
+    </div>
+@endsection
diff --git a/resources/views/layouts/footer.blade.php b/resources/views/layouts/footer.blade.php
index 6abd853..e589144 100644
--- a/resources/views/layouts/footer.blade.php
+++ b/resources/views/layouts/footer.blade.php
@@ -30,12 +30,12 @@
                         <span>地址：{{  config('address') }}</span>
                     </div>
                     <div class="Footer-tips-label">
-                        <span>邮件：{{  config('email') }}</span>
+{{--                        <span>邮件：{{  config('email') }}</span>--}}
                         <span>邮编：{{  config('postcode') }}</span>
                     </div>
                     <div class="Footer-tips-label">
-                        <span>电话：{{  config('email') }}</span>
-                        <span>传真：{{  config('email') }}</span>
+                        <span>电话：{{  config('mobile') }}</span>
+{{--                        <span>传真：{{  config('email') }}</span>--}}
                     </div>
                 </ul>
             </div>