From d60b92b3f80d89064dd7f41adb274672a5c16e81 Mon Sep 17 00:00:00 2001 From: xuanchen <122383162@qq.com> Date: Thu, 3 Jun 2021 16:03:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BD=91=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/CategoryController.php | 2 +- public/assets/index/css/style.css | 32 ++++-- resources/views/category/list.blade.php | 108 ++++++++------------ resources/views/index/index.blade.php | 73 +++++++++---- resources/views/layouts/app.blade.php | 4 +- resources/views/layouts/master.blade.php | 103 +++++++++++++++++++ 6 files changed, 228 insertions(+), 94 deletions(-) create mode 100644 resources/views/layouts/master.blade.php diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index e50c413..87ed193 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -10,7 +10,7 @@ class CategoryController extends Controller /** * 显示分类 - * @param Category $category [description] + * @param Category $category [description] * @return [type] [description] */ public function index(Category $category) diff --git a/public/assets/index/css/style.css b/public/assets/index/css/style.css index 0be1cfa..68eea8b 100644 --- a/public/assets/index/css/style.css +++ b/public/assets/index/css/style.css @@ -41,7 +41,7 @@ img {max-width: 100%;} /* 轮播图 */ .indexImg {background: url(../images/bannerBack.jpg) repeat-x center; height: 340px; overflow: hidden;} .indexImg-img {width: 100%;cursor: pointer; height: 340px;} -.indexImg-title {position: absolute; z-index: 99; left: 0; bottom: 0; background-color: rgba(0,0,0,.5); width: 100%; color: #fff; padding: 10px 15px; box-sizing: border-box; font-size: 16px;} +.indexImg-title {position: absolute; z-index: 99; left: 0; bottom: 0; background-color: rgba(0,0,0,.5); width: 100%; color: #fff; padding: 10px 100px 10px 15px; box-sizing: border-box; font-size: 16px;} .indexImg-pagination, .indexNews-pagination {text-align: right !important; padding-right: 20px !important;} .indexImg-pagination span.swiper-pagination-bullet {width: 11px; height: 11px; opacity: 1; background-color: #fff;} @@ -59,6 +59,10 @@ img {max-width: 100%;} .indexNews-ul-name {flex: 1; margin-right: 20px;} /* 党政建设 */ +.indexBuild-new {width: 100%; text-align: center;border-radius: 10px;overflow: hidden;color: #fff; padding: 20px 30px; font-size: 20px; word-wrap:break-word;height: 190px; display: inline-block; background-color: #ba0013; box-sizing: border-box;} +.indexBuild-new:hover {color: #fff;} +.indexBuild-new .indexBuild-icon {border-color: #9a0211;} + .indexBuild {padding: 20px 0; background-color: #f7f7f7;} .indexBuild-list {overflow: hidden; margin: 10px -10px;} .indexBuild-list li {width: calc(50% - 20px); margin: 10px; float: left; text-align: center; border-radius: 10px; overflow: hidden; padding: 20px 0; height: 190px;} @@ -79,9 +83,15 @@ img {max-width: 100%;} .indexBuild-talent-title {padding: 0 10px; box-sizing: border-box; background-color: #ecf3f9; line-height: 40px; color: #016cd5; font-weight: 600; font-size: 18px; display: flex;} .indexBuild-talent-title span {display: inline-block; flex: 1;} .indexBuild-talent-title a{color: #005eb5; font-size: 16px;} -.indexBuild-swiper {text-align: center; margin: 25px 0 10px; height: 100px; font-size: 16px;} -.indexBuild-swiper span {color: #bdbdbd; padding-left: 30px;} +.indexBuild-swiper, +.indexBuildNew-swiper {text-align: center; margin: 25px 0 10px; height: 100px; font-size: 16px;} +.indexBuild-swiper span, +.indexBuildNew-swiper span {color: #bdbdbd; padding-left: 30px;} .indexNews-title {display: flex; border-bottom: 1px solid #e8e8e8; padding-bottom: 10px; margin-bottom: 20px;} +.swiper-cont .swiper-container { + width: 50%; + float: left; +} .indexNews-title-name {flex: 1; color: #ececec; line-height: 30px; display: flex; font-size: 20px; position: relative;} .indexNews-title-name::after, .indexNews-title-name::before {position: absolute; content: '';} @@ -175,7 +185,7 @@ img {max-width: 100%;} .indexTeam-content .tab-pane:nth-child(5)::before{left:1022px;} .indexTeam-content .tab-pane:nth-child(5)::after{left:1021px;} .indexTeam-ul {height: 400px; box-sizing: border-box;} -.indexTeam-ul li {width: calc(33.33% - 40px); text-align: center; float: left; margin: 0 20px;box-shadow: 0 0 20px rgba(0,0,0,.1); height: 400px;overflow: hidden;} +.indexTeam-ul li {width: calc(25% - 40px); text-align: center; float: left; margin: 0 20px;box-shadow: 0 0 20px rgba(0,0,0,.1); height: 400px;overflow: hidden;} .indexTeam-img {position: relative; width: 100%; padding-top: 70%;} .indexTeam-cont {padding: 0 40px; box-sizing: border-box; font-size: 16px; line-height: 28px;} .indexTeam-name {font-size: 18px; font-weight: 600; margin: 20px 0;} @@ -291,7 +301,8 @@ img {max-width: 100%;} .newBranch-img {position: relative; width: 100px; height: 80px; transition: .2s;} .newBranch li:hover .newBranch-img {transform: scale(1.1);} .newBranch-cont {position: absolute; left: 0; top: 0; width: 100%; padding-left: 100px; box-sizing: border-box; padding-right: 20px; display: flex;} -.newBranch-time {text-align: center; margin: 8px 15px; font-size: 16px;} +.newBranch-time {text-align: center; margin: 8px 15px; font-size: 16px; width: 80px;} +.newBranch-text {width: calc(100% - 110px);} .newBranch-time>span {font-size: 30px;} .newBranch-name {font-size: 18px; margin-bottom: 10px;} .newBranch-tips {height: 44px; line-height: 22px; color: #6d6c6c;} @@ -400,8 +411,17 @@ img {max-width: 100%;} /* 漂浮的工具栏 */ .laytool { position: fixed; top: 45vh; left: calc(50% + 615px); z-index: 99; } -.laytool-ul li { position: relative; margin-bottom: 5px; width: 40px; height: 40px; line-height: 40px; text-align: center; background-image: url(../images/z19_scroll_wx.png); background-repeat: no-repeat; background-size: cover; background-position: center; font-size: 18px; transition: background .3s; border-radius: 5px;} +.laytool-ul li { position: relative; margin-bottom: 5px; width: 40px; height: 40px; line-height: 40px; text-align: center; background-image: url(../images/z19_scroll_wx.png); background-repeat: no-repeat; background-size: cover; background-position: center; font-size: 18px; transition: background .3s; border-radius: 5px; cursor: pointer;} .wechat-code { position: absolute; left: -305px; top: -169px; width: 300px; height: 379px; display: none; } .wechat-code img { width: 100%; vertical-align: top; } .laytool-ul i { color: white;} .laytool-ul li:hover .wechat-code { display: block;} + +/*列表新增样式*/ +.dateExtend {margin-top: 30px;} +.dateExtend a {display: flex; margin-bottom: 20px; border-bottom: 1px dashed #e6e6e6; padding-bottom: 20px; transition: .2s;} +.dateExtend-left {width: 70px; text-align: right; padding: 10px 10px 10px 0; box-sizing: border-box;background-color: transparent;} +.dateExtend-left span {display: block; font-size: 20px; font-weight: 600;} +.dateExtend a:hover .dateExtend-left {background-color: #203175; color: #fff;} +.dateExtend-right {width: calc(100% - 90px); margin-left: 20px; padding-top: 10px;} +.dateExtend-right .indexExtend-ul-name {margin-bottom: 0;} diff --git a/resources/views/category/list.blade.php b/resources/views/category/list.blade.php index 82d5ff5..e9ae5dc 100644 --- a/resources/views/category/list.blade.php +++ b/resources/views/category/list.blade.php @@ -3,73 +3,51 @@ @section('title', '首页') @section('content') - -
- -
-
- {{ $parent->title }} -

Exchange and cooperation

-
- + + + + @if ($articles->isNotEmpty()) + {{ $articles->links('layouts.pagination') }} + @endif +
+
- + @endsection diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php index 437c864..4dcd243 100644 --- a/resources/views/index/index.blade.php +++ b/resources/views/index/index.blade.php @@ -109,25 +109,49 @@ {{ getOneCategory(28,'title') }} MORE -
-
- @if (getArticlesBYCate(28,8)->isNotEmpty()) - @foreach (getArticlesBYCate(28,8) as $article) -
{{ $article->title }} - {{ $article->description }} -
- @endforeach - @endif +
+
+
+ @if (getArticlesBYCate(28,8)->isNotEmpty()) + @foreach (getArticlesBYCate(28,8) as $article) + @if($loop->index < 3) +
+ {{ $article->title }} + {{ $article->description }} +
+ @endif + @endforeach + @endif +
+
+
+
+
+
+ @if (getArticlesBYCate(28,8)->isNotEmpty()) + @foreach (getArticlesBYCate(28,8) as $article) + @if($loop->index >= 3) +
+ {{ $article->title }} + {{ $article->description }} +
+ @endif + @endforeach + @endif +
- {{-- 梯队人才下边--}} @if (getArticlesBYCate(24,5,'all',false,'asc')->isNotEmpty()) @foreach (getArticlesBYCate(24,5) as $article) @if($loop->index==4) - - + +
+ +
+ {{ $article->title }} + @endif @endforeach @@ -220,23 +244,23 @@
- {{ getOneCategory(11,'title') }} + {{ getOneCategory(17,'title') }}
- +
- {{ getOneArticleBYCate(11,'title') }} + {{ getOneArticleBYCate(17,'title') }}
- {{ getOneArticleBYCate(11,'description') }} + {{ getOneArticleBYCate(17,'description') }}
- MORE + MORE
@@ -339,8 +363,8 @@