Merge remote-tracking branch 'origin/master'

app/Http/Controllers/Web/HomeController.php

@@ -270,7 +270,7 @@ class HomeController extends WebBaseController
         //人才新闻
 //        $ad_pic_where1[] = ['small_img', '<>', ''];
 //        $ad_pic1         = Article::where($ad_pic_where1)->whereIn('type_id', [58, 59])->orderBy('list_order', 'asc')->orderBy('id', 'desc')->limit(1)->get();
-        $ad_pic1         = Article::whereNotNull('small_img')->orderBy('list_order', 'desc')->orderBy('id', 'desc')->limit(1)->get();
+//        $ad_pic1         = Article::whereNotNull('small_img')->orderBy('list_order', 'desc')->orderBy('id', 'desc')->limit(1)->get();
 
         //人才疗休养活动
         $ad_pic_where2[] = ['r_c_id', '!=', 0];
@@ -281,12 +281,12 @@ class HomeController extends WebBaseController
         $Recuperatecategory_arr = RecuperateCategory::where('deleted_at', null)->select('id', 'name')->get()->toArray();
 
         //人才新闻
-        $ad_pic3 = Article::whereIn('type_id', [58, 59])->where('is_display', 1)->orderBy('list_order', 'desc')->orderBy('id', 'desc')->limit(4)->get();
+        $ad_pic3 = Article::whereIn('type_id', [58, 59])->where('is_display', 1)->orderBy('list_order', 'desc')->orderBy('id', 'desc')->limit(12)->get();
 
 //        $rcinfos = $this->policyService->getRcInfosByIndex();
 
         //招考系统
-        $recruit = Recruit::where([['status', '=', 1]])->orderBy('ordid', 'desc')->orderBy('updated_at', 'desc')->limit(4)->get();
+        $recruit = Recruit::where([['status', '=', 1]])->orderBy(DB::raw('field(current,1,2,3,4,5,6,7,8,9,0)'))->orderBy('updated_at','desc')->limit(4)->get();
         if (!$recruit->isEmpty()) {
             foreach ($recruit as $k => $v) {
                 $recruit[$k] = Recruit::parse_index($v);
@@ -314,7 +314,7 @@ class HomeController extends WebBaseController
             'viewResume'              => $viewResume,
             'mypms'                   => $mypms,
             'articles_img'            => $articles_img,
-            'ad_pic1'                 => $ad_pic1,
+//            'ad_pic1'                 => $ad_pic1,
             'ad_pic2'                 => $ad_pic2,
             'ad_pic3'                 => $ad_pic3,
             //            'rcinfos'                 => $rcinfos,

public/themes/default/assets/app/css/index_new2.css

@@ -641,7 +641,9 @@ body{
     background:#bc2c34;
     color:#fff;
 }
-
+.home_jucai_trends .trends_box {
+    width: 50%;
+}
 .home_jucai_trends .trends_box .box_item{
     width:285px;
     height:350px;
@@ -703,8 +705,136 @@ body{
     color:#fff;
 }
 
+/*新版新闻*/
+.home_jucai_trends .lw-news-box {
+    display:flex;
+    justify-content:space-between;
+}
+.home_jucai_trends .lw-news-box .title-box {
+    display:flex;
+    padding-left: 10px;
+    padding-right: 30px;
+    height: 30px;
+}
+.home_jucai_trends .lw-news-box .title-box a{
+    font-size:14px;
+    color:#bc2c34;
+    margin-left: auto;
+}
+.home_jucai_trends .lw-news-box .title-box a:hover{
+    text-decoration:underline;
+}
+.home_jucai_trends .lw-news-box .lw-recruit,.home_jucai_trends .lw-news-box .lw-news{
+    box-sizing: border-box;
+}
+.home_jucai_trends .lw-news-box .lw-recruit{
+    width: 285px;
+    position:relative;
+}
+.home_jucai_trends .lw-news-box .lw-recruit .line {
+    position:absolute;
+    border-right:1px solid #c0c0c0;
+    height: 610px;
+    top: 0;
+    right: -5px;
+}
+.home_jucai_trends .lw-news-box .lw-news {
+    width: 915px;
+}
+.home_jucai_trends .recruit-box .box_item{
+    width:275px;
+    height: 130px;
+    border-radius:5px;
+    border: 1px solid #c0c0c0;
+    margin-top:20px;
+    box-sizing:border-box;
+    padding: 5px 10px;
+}
+.home_jucai_trends .recruit-box .box_item:first-child{
+    margin-top:0;
+}
+.home_jucai_trends .recruit-box .box_item .news_title {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+.home_jucai_trends .recruit-box .box_item.begin {
+    border: 2px solid #DD4250;
+}
+.home_jucai_trends .recruit-box .box_item .news_title a{
+    font-size:16px;
+    color:#333333;
+}
+.home_jucai_trends .recruit-box .box_item .news_title a:hover{
+    color:#bc2c34;
+}
+.home_jucai_trends .lw-news-box .lw-news .news-box {
+    display:flex;
+    justify-content:space-between;
+    width:915px;
+    flex-wrap: wrap;
+}
+.home_jucai_trends .lw-news-box .lw-news .box_item {
+    width: 285px;
+    height: 130px;
+    border-radius:5px;
+    border: 1px solid #c0c0c0;
+    margin-top:20px;
+    margin-left: 20px;
+    box-sizing:border-box;
+    padding: 5px 10px;
+}
+.home_jucai_trends .news-box .box_item:nth-child(-n + 3) {
+    margin-top:0;
+}
+.home_jucai_trends .lw-news .box_item .news_title {
+    height: 63px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+}
+.home_jucai_trends .lw-news .box_item .news_title a {
+    font-size: 16px;
+    color: #333333;
+}
+.home_jucai_trends .lw-news .box_item .news_title a:hover{
+    color:#bc2c34;
+}
+.home_jucai_trends .lw-news .box_item .news_content {
+    margin-top: 30px;
+}
+/*.home_jucai_trends .lw-news-box .lw-news .news-box {*/
+    /*width:860px;*/
+    /*margin: 0 auto;*/
+/*}*/
+/*.home_jucai_trends .lw-news-box .lw-news .news-box .news-item{*/
+    /*display: flex;*/
+    /*justify-content: space-between;*/
+    /*height:48px;*/
+    /*line-height:48px;*/
+    /*border-bottom:1px dashed #c0c0c0;*/
+/*}*/
+/*.home_jucai_trends .lw-news-box .lw-news .news-box .news-item div {*/
+    /*width: 680px;*/
+    /*white-space: nowrap;*/
+    /*overflow: hidden;*/
+    /*text-overflow: ellipsis;*/
+/*}*/
+/*.home_jucai_trends .lw-news-box .lw-news .news-box .news-item div a {*/
+    /*font-size: 16px;*/
+    /*color:#333;*/
+/*}*/
+/*.home_jucai_trends .lw-news-box .lw-news .news-box .news-item div a:hover {*/
+    /*color:#bc2c34;*/
+/*}*/
+
 
-/*人才活动*/
+    /*人才活动*/
 .home_actives_part{
     background:#fff;
     padding-bottom:40px;

public/themes/default/views/app/index.blade.php

@@ -365,7 +365,64 @@
                 <div class="title_ch">招聘资讯</div>
                 <div class="title_en">RECRUIT&nbsp;INFORMATION</div>
             </div>
-            <div class="trends_box">
+            <div class="lw-news-box">
+                <div class="lw-recruit">
+                    <div class="title-box">
+                        <h3>单位招考</h3>
+                        <a href="{{route('recruit.index.list')}}">更多+</a>
+                    </div>
+                    <div class="recruit-box">
+                        @if(!$recruit->isEmpty())
+                            @foreach($recruit as $k=>$v)
+                                <div class="box_item @if($v->current > 0) begin @endif">
+                                    <div class="news_info">
+                                        <div class="news_title"><a href="{{route('recruit.index.show',['id'=>$v->id])}}"
+                                                                   target="_blank">{{$v->name}}</a></div>
+                                        <div class="news_content">
+                                            <p style="color:#bc2c34;">状态：{{$v->current_text}}</p>
+                                            <p>时间：{{$v->current_time}}</p>
+                                            <p>流程：{{$v->step_text}}</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            @endforeach
+                        @else
+                            <div style="line-height:190px;text-align:center;font-size:16px;">暂无招考</div>
+                        @endif
+                    </div>
+                    <div class="line"></div>
+                </div>
+                <div class="lw-news">
+                    <div class="title-box" style="padding-left:30px;">
+                        <h3>招考资讯</h3>
+                        <a href="{{route('news.list',['id'=>57])}}">更多+</a>
+                    </div>
+                    <div class="news-box">
+                        @if(!$ad_pic3->isEmpty())
+                            @foreach($ad_pic3 as $k=>$v)
+                                <div class="box_item">
+                                    <div class="news_info">
+                                        <div class="news_title"><a href="{{route('news.show',['id'=>$v->id])}}"
+                                                                   target="_blank">{{$v->title}}</a></div>
+                                        <div class="news_content">
+{{--                                            <p style="text-indent:2em;">{!!  cut_str(strip_tags(htmlspecialchars_decode($v->content,ENT_QUOTES)),'32',0,'...') !!}</p>--}}
+                                            <p style="text-align:right;">{{date('Y-m-d',strtotime($v->created_at))}}</p>
+                                        </div>
+                                    </div>
+                                </div>
+                                {{--<div class="news-item">--}}
+                                    {{--<div><a href="{{route('news.show',['id'=>$v->id])}}">{{$v->title}}</a></div>--}}
+                                    {{--<p>{{date('Y-m-d',strtotime($v->created_at))}}</p>--}}
+                                {{--</div>--}}
+                            @endforeach
+                        @else
+                            <div style="line-height:190px;text-align:center;font-size:16px;">暂无新闻</div>
+                        @endif
+                    </div>
+                </div>
+            </div>
+
+            {{--<div class="trends_box">
                 <div class="home_pic_news">
                     @if($ad_pic1 && count($ad_pic1)>0)
                         @foreach($ad_pic1 as $k=>$v)
@@ -414,7 +471,7 @@
                 <div class="clear"></div>
                 <a href="{{route('news.list',['id'=>57])}}" class="box_more" target="_blank">查看更多&gt;</a>
             </div>
-            <div class="trends_box" style="display: none;">
+            <div class="trends_box">
                 @if(!$recruit->isEmpty())
                     @foreach($recruit as $k=>$v)
                         <div class="box_item">
@@ -438,7 +495,7 @@
                 @endif
             </div>
             <div class="clear"></div>
-        </div>
+        </div>--}}
     </div>
 
     {{--背调测评--}}