备份文件

public/assets/index/css/style.css

@@ -2668,6 +2668,7 @@ input {
     width: 200px;
     z-index: 9999;
 }
+
 .bay-close {
     position: absolute;
     top: 0;
@@ -2676,12 +2677,14 @@ input {
     width: 100%;
     z-index: 100;
 }
+
 .bay-img {
     position: absolute;
     top: 20px;
     right: 0;
     width: 200px;
 }
+
 .mb {
     display: none;
 }
@@ -2692,9 +2695,11 @@ input {
     .mb {
         display: block;
     }
+
     .pc {
         display: none;
     }
+
     .sidebar {
         display: none;
     }
@@ -2714,26 +2719,32 @@ input {
     .logo>img {
         width: 100%;
     }
+
     .mbNav {
         display: flex;
         margin-top: 10px;
         align-items: center;
     }
+
     .nav-list {
         flex-direction: column;
         width: 100%;
         height: 100%;
     }
+
     .nav-list li {
         width: 100%;
         padding: 10px 0;
     }
+
     .nav-list li:hover {
         background: #507ac3;
     }
+
     .nav-list li::after {
         display: none;
     }
+
     .mb_nav {
         position: absolute;
         z-index: 999;
@@ -2743,6 +2754,7 @@ input {
         top: 97%;
         display: none;
     }
+
     .mbLogo-nav {
         width: 3.5rem;
         height: 3.5rem;
@@ -2750,52 +2762,65 @@ input {
         border-radius: 5px;
         margin-left: 10px;
     }
+
     .search {
         width: 100%;
         margin-top: 0;
         position: relative;
     }
+
     .search button {
         position: absolute;
         right: 1rem;
     }
+
     /* 公告 */
     .notice {
         padding: 0px 20px;
     }
+
     .notice>.container>.col-md-12 {
         padding: 0px;
     }
+
     .notice-name {
         font-size: 20px;
     }
+
     .notice-text {
         font-size: 15px;
     }
+
     .notice-title {
         position: static;
         width: 100%;
         height: 100%;
         text-align: center;
     }
+
     .noticeRight {
         width: 100px;
     }
+
     .noticeLeft {
         padding-right: 20px;
     }
+
     .notice-container {
         display: block;
         padding-bottom: 10px;
     }
+
     .notice-cont {
         padding-left: 0px;
         align-items: center;
         margin: 10px 0;
     }
+
     .notice-date>span {
         font-size: 25px;
     }
+
     .banner {
         position: relative;
         height: 80px;
@@ -2806,45 +2831,63 @@ input {
     .ce-img>span {
         background-size: 100%;
     }
+
     /* 二级导航 */
     .second {
         margin: 10px 0;
     }
+
     .mbSecond {
         display: flex;
         flex-direction: column;
     }
+
     .leftNav-title {
         line-height: 56px;
         font-size: 20px;
     }
+
     .leftNav-list li {
         line-height: 40px;
         font-size: 15px;
         padding: 0 12px 0 35px;
     }
+
     .secondLeft {
         display: flex;
-        width: 100%;
+        width: calc(100% - 10px);
         justify-content: center;
     }
+
     .leftBanner {
         margin-top: 0px;
     }
+
     .leftNav-list li::after {
         left: 14%;
         top: 32%;
     }
+
     .leftBanner img {
         width: 105%;
     }
+
     .secondRight {
-        width: calc(100% - 20px);
+        width: calc(100% - 30px);
         margin: 15px;
     }
+
+    .leftNav-list li>a {
+        width: 80px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+    }
+
     .studyList li {
         margin-bottom: 10px;
     }
+
     /* 新闻动态 */
     .news {
         position: relative;
@@ -2871,12 +2914,65 @@ input {
         margin-left: 0px;
     }
 
+    .noticeList li:last-child {
+        margin-bottom: 10px;
+    }
+
+    .trendsTitle {
+        white-space: nowrap;
+        overflow: hidden;
+    }
+
+    .trendsTitle-more {
+        font-size: 15px;
+        position: static;
+        background-color: #f3f3f3;
+        text-align: center;
+        font-weight: normal;
+        padding: 20px 0;
+        color: #a0a0a0;
+        margin-bottom: 30px;
+    }
+
+    .pressList-cont,
+    .GraphList-cont {
+        padding-left: 55%;
+    }
+    .pressList-more{
+        padding: 0 15px;
+    }
+
+    .pressList-img,
+    .GraphList-img {
+        width: 50%;
+    }
+
+    .GraphList-time>span {
+        margin-right: 2%;
+        padding-right: 2%;
+    }
+
+    .GraphList-time {
+        flex-direction: column;
+    }
+
+    .GraphList-text {
+        margin: 20px 0;
+    }
+    .specialList li{
+        width: 100%;
+    }
+
     /* 首页党政建设 */
     .modular-list {
         display: flex;
         flex-direction: column;
     }
 
+    .GraphList-more img {
+        padding-left: 0;
+    }
+
     .modularLeft,
     .modularRight {
         width: 100%;
@@ -2888,88 +2984,209 @@ input {
         margin: 0;
         margin-top: 15px;
     }
+
     .TabCont-top-img {
         position: relative;
         width: 100%;
         height: 180px;
     }
+
     .TabCont-top-tips {
         background-color: rgba(0, 0, 0, .5);
         width: 100%;
         top: 37%;
         padding: 0;
     }
+
     .TabCont-top-title {
         font-size: 22px;
         color: #507ac3;
         margin: 10px 0;
     }
+
     .indexTab-ul li span {
         padding: 30px 0px 10px;
         display: block;
         font-size: 16px;
     }
+
     .indexTab-ul li span::after {
         left: 30%;
         top: 10%;
         width: 30px;
         height: 30px;
     }
+
     /* 组织机构 */
     .organBrief-img {
         width: 100%;
         padding-top: 100%;
     }
-    .organ-button-next, .organ-button-prev {
+
+    .organ-button-next,
+    .organ-button-prev {
         top: 70%;
     }
+
     .mbOrganBrief-text {
         height: 235px;
         overflow: hidden;
         margin: 10px;
     }
+
     .organBrief-text {
         padding: 5px;
         height: 310px;
     }
+
     .organBrief-more>a>img {
         padding-left: 0px;
     }
+
     .organBrief-more {
         margin-top: 10px;
         white-space: nowrap;
         text-align: center;
     }
+
     .organBrief-cont {
         height: 310px;
         margin-bottom: 0px;
     }
+
     .leaderList-name {
         font-size: 24px;
         width: 100px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
     }
+
     .leaderList-text {
         font-size: 14px;
     }
+
     .insideList-name {
         font-size: 16px;
     }
+
     .versionList-name {
         font-size: 20px;
     }
+
+    .leaderList-tips {
+        padding: 0 6px;
+        white-space: nowrap;
+    }
+
+    /* 创新平台 */
+    .echelonList li {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .echelonList-img {
+        width: 100%;
+    }
+
+    .echelonList-cont {
+        padding: 0;
+        position: static;
+    }
+
+    .trendsModular {
+        margin: 0;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .trendsModular .trendsLabel {
+        width: calc(100% - 20px);
+        margin: 10px;
+    }
+
+    .platform {
+        margin-bottom: 10px;
+    }
+
+    .innovateList-name {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        margin-right: 5px;
+    }
+
     /* 预决算公告 */
     .noRecord {
         padding: 0px;
     }
+
     .contactUs-code img {
         margin: 0 auto;
     }
+
     .contactUs-code {
         position: static;
     }
+
     .contactUs-label>span {
         width: 100%;
     }
+    /* 科研成果 */
+    .gainList-img{
+        width: 100%;
+    }
+    .gainList-cont{
+        position: static;
+        padding: 10px 20px 20px;
+    }
+    .awardList-time{
+        width: 60px;
+    }
+    .awardList-title {
+        width: calc(100% - 55px);
+        padding-left: 15px;
+    }
+    .awardList-img{
+        width: 50%;
+    }
+    .awardList-cont {
+        width: calc(100% - 100px);
+        margin-right: 10px;
+    }
+    /* 能源环境学会 */
+    .learnTop-title::after{
+        width: 100%;
+    }
+    .learnTop-more{
+        display: block;
+        position: static;
+    }
+    .learnTop-title{
+        text-align: center;
+    }
+    .learnNews {
+        flex-direction: column;
+    }
+    .learnNews-left{
+        width: 100%;
+    }
+    .learnList-img{
+        width: 50%;
+    }
+    .learnNews-right{
+        width: 100%;
+        margin: 0;
+    }
+    .learnList-cont{
+        padding: 10px 10px 10px 50%;
+    }
+    /* 分页 */
+    .pagination>li {
+        display: inline-grid;
+        margin: 10px 0px;
+    }
+
     /* 网页底部 */
     .footerLinks {
         display: flex;

resources/views/category/xwdt.blade.php

@@ -42,11 +42,10 @@
                                 @endforeach
                             @endif
                         </ul>
-                        <div>
+                        <!-- 手机版查看更多 -->
                         <a href="{{ $tzCate->link }}" class="mb trendsTitle-more">查看更多 +</a>
                     </div>
                 </div>
-                </div>
 
                 <!-- 能源院新闻 -->
                 <div class="trends">
@@ -54,7 +53,7 @@
                         <div class="trendsTitle">
                             <img src="{{ asset('assets/index/images/newsIcon_2.png') }}">{{ $nyydtCate->title }}
                             <span>/  {{ $nyydtCate->description }}</span>
-                            <a href="{{ $nyydtCate->link }}" class="trendsTitle-more">查看更多 +</a>
+                            <a href="{{ $nyydtCate->link }}" class="pc trendsTitle-more">查看更多 +</a>
                         </div>
                         <ul class="pressList">
                             @if($nyydtArticles->isNotEmpty())
@@ -82,6 +81,8 @@
                                 @endforeach
                             @endif
                         </ul>
+                        <!-- 手机版查看更多 -->
+                        <a href="{{ $nyydtCate->link }}" class="mb trendsTitle-more">查看更多 +</a>
                     </div>
                 </div>
 
@@ -91,7 +92,7 @@
                         <div class="trendsTitle">
                             <img src="{{ asset('assets/index/images/newsIcon_2.png') }}">{{ $mtbdCate->title }}
                             <span>/  {{ $mtbdCate->description }}</span>
-                            <a href="{{ $mtbdCate->link }}" class="trendsTitle-more">查看更多 +</a>
+                            <a href="{{ $mtbdCate->link }}" class="pc trendsTitle-more">查看更多 +</a>
                         </div>
                         <ul class="specialList">
                             @if($mtbdArticles->isNotEmpty())
@@ -116,6 +117,7 @@
                                 @endforeach
                             @endif
                         </ul>
+                        <a href="{{ $mtbdCate->link }}" class="mb trendsTitle-more">查看更多 +</a>
                     </div>
                 </div>
             </div>

resources/views/layouts/header.blade.php

@@ -15,10 +15,10 @@
 <!-- End 右侧漂浮窗 -->
 
 <!-- 漂浮窗 -->
-<a class="showy pc" id="bay" href="http://nyfh.has.ac.cn/articles/399">
+<!-- <a class="showy pc" id="bay" href="http://www.hasnyy.org.cn/articles/402">
     <div class="bay-close" style="text-align:right;cursor:pointer;" id="close">关闭</div>
     <img class="bay-img" src="/assets/index/images/showy.jpg" />
-</a>
+</a> -->
 
 <!-- header -->
 <header class="header">