Merge branch 'master' of http://git.yuzhankeji.cn/xuanchen/new_nyfh

resources/views/index/index.blade.php

@@ -14,7 +14,7 @@
                         <span>/ {{ getOneCategory(7,'description') }}</span>
                     </div>
                     <div class="idxTitle-more" data-href="{{ getOneCategory(7,'link') }}">
-                        查看更多<img src="images/idxRow.png">
+                        查看更多<img src="/assets/index/images/idxRow.png">
                     </div>
                 </div>
                 <div class="oneCont-top">
@@ -35,10 +35,12 @@
                         </div>
                         <ul class="oneCont-ul">
                             @foreach (getArticlesBYCate(7,5) as $article)
+                                @if ($loop->iteration>1)
                                     <li data-href="{{ $article->link }}">
                                         <p class="ce-nowrap">{{ $article->title }}</p>
                                         <span>{{ $article->created_at->format('Y-m-d') }}</span>
                                     </li>
+                                @endif
                             @endforeach
                         </ul>
                     @endif
@@ -70,6 +72,8 @@
     <!-- end 第一模板 -->
 
     <!-- 第二模板 -->
+    @if (getArticlesBYCate(24,4)->isNotEmpty())
+
         <div class="idxTwo ce-morgin-tb">
             <div class="contant">
                 <div class="idxTitle">
@@ -81,7 +85,6 @@
                     </div>
                 </div>
                 <ul class="newTwo-list">
-                @if (getArticlesBYCate(24,4)->isNotEmpty())
                     @foreach (getArticlesBYCate(24,4) as $article)
                         <li data-href="{{ $article->link }}">
                             <div class="ce-img newTwo-list-img">
@@ -93,10 +96,11 @@
                             </div>
                         </li>
                     @endforeach
-                @endif
                 </ul>
             </div>
         </div>
+    @endif
+
     <!-- end 第二模板 -->
 
     <!-- 第三模板 -->
@@ -188,6 +192,8 @@
     <!-- end 第三模板 -->
 
     <!-- 第四模板 -->
+    @if (getArticlesBYCate(8,4)->isNotEmpty())
+
         <div class="idxFour ce-morgin-tb">
             <div class="contant">
                 <div class="idxTitle">
@@ -200,7 +206,6 @@
                     <div class="swiper-container idxFour-container">
                         <div class="swiper-wrapper">
 
-                        @if (getArticlesBYCate(8,4)->isNotEmpty())
                             @foreach (getArticlesBYCate(8,4) as $article)
                                 <div class="swiper-slide idxFour-slide">
                                     <div class="ce-img idxFour-img">
@@ -219,7 +224,6 @@
                                     </div>
                                 </div>
                             @endforeach
-                        @endif
                         </div>
                     </div>
                     <!-- Add Arrows -->
@@ -230,6 +234,8 @@
                 </div>
             </div>
         </div>
+    @endif
+
     <!-- end 第四模板 -->
 
 @endsection