Merge branch 'master' of http://59.57.98.130:3000/jjhc/jucai

app/Http/Controllers/Mobile/HomeController.php

@@ -142,17 +142,17 @@ class HomeController extends MobileBaseController
         $notices       = $this->noticeServer->getNotices($notice_filter);
 
 
-        //聚才动态
+        //单位招聘
         $articles1_map = [
-            'type_id'  => [3],
+            'type_id'  => [59],
             'limit'    => 8,
             'titlelen' => 15,
             'dot'      => '...',
         ];
         $articles1     = $this->articleService->getArticleCache($articles1_map, 'home');
-        //工作动态
+        //公告公示
         $articles2_map = [
-            'type_id'  => [2],
+            'type_id'  => [58],
             'limit'    => 8,
             'titlelen' => 25,
             'dot'      => '...',

app/Http/Controllers/Web/HomeController.php

@@ -282,7 +282,7 @@ class HomeController extends WebBaseController
         //人才新闻
         $ad_pic3         = Article::whereIn('type_id',[58, 59])->orderBy('list_order', 'desc')->orderBy('id', 'desc')->limit(4)->get();
 
-        $rcinfos = $this->policyService->getRcInfosByIndex();
+//        $rcinfos = $this->policyService->getRcInfosByIndex();
 
         //招考系统
         $recruit = Recruit::where([['status', '=', 1]])->orderBy('ordid', 'desc')->orderBy('updated_at', 'desc')->limit(4)->get();
@@ -316,7 +316,7 @@ class HomeController extends WebBaseController
             'ad_pic1'                 => $ad_pic1,
             'ad_pic2'                 => $ad_pic2,
             'ad_pic3'                 => $ad_pic3,
-            'rcinfos'                 => $rcinfos,
+//            'rcinfos'                 => $rcinfos,
             'recuperate_category_arr' => $Recuperatecategory_arr,
             'recruit'                 => $recruit,
         ];

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

@@ -695,14 +695,10 @@ body{
     height:45px;
     line-height:45px;
     text-align:center;
-    border:1px solid #cccccc;
     border-radius:3px;
-    color:#999999;
     font-size:16px;
     display:block;
     margin:30px auto 0;
-}
-.home_jucai_trends .box_more:hover{
     border-color:#bc2c34;
     background:#bc2c34;
     color:#fff;
@@ -782,14 +778,10 @@ body{
     height:45px;
     line-height:45px;
     text-align:center;
-    border:1px solid #cccccc;
     border-radius:3px;
-    color:#999999;
     font-size:16px;
     display:block;
     margin:30px auto 0;
-}
-.home_actives_part .active_show .active_box .box_more:hover{
     border-color:#bc2c34;
     background:#bc2c34;
     color:#fff;

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

@@ -33,8 +33,9 @@
             overflow: hidden;
             background-color: #f0f0f0;
         }
-        .swiper-container{
-            width: 1200px;
+        .swiper-container,.swiper-slide img{
+            width: 750px;
+            height:290px;
         }
         .swiper-slide{
             text-align: center;
@@ -305,31 +306,24 @@
     </div>--}}
 
     <div class="wide">
-        <a href="https://qzrcpx.open.com.cn/" target="_blank" style="margin-top: 10px;display: inline-block">
-            <img src="{{ theme_asset('app/images/xinhua_ad.jpg') }}" />
-        </a>
         <div class="web_intro_box">
-            <div class="box_img"><img src="{{theme_asset('app/images/index/intro_box_img.jpg')}}"/></div>
-            <div class="box_content">
-                <div class="content_title">晋江概览</div>
-                <div class="content_title_label"><span>中国品牌之都 · 现代产业中心 · 滨海生态城市</span></div>
-                <div class="intro_title">晋江起点</div>
-                <div class="intro_info">
-                    晋江三面临海，土地资源的匮乏激起了晋江人的开拓意识，晋江先民开展多种经营，发展工商经济和海外贸易，带来了晋江商业的繁荣。宋元时期，晋江口的泉州港号称“东方第一大港”，是“海上丝绸之路”的起点。
-                </div>
-                <div class="intro_title">晋江名片</div>
-                <div class="info_tag">
-                    <div class="tag_item">中国品牌之都</div>
-                    <div class="tag_item">国家园林城市</div>
-                    <div class="tag_item">中国民间戏剧之乡</div>
-                    <div class="tag_item">福建省文明城市</div>
-                    <div class="tag_item">全国城市</div>
-                    <div class="tag_item">卫生先进市</div>
-                    <div class="tag_item">中国爱心城市</div>
-                    <div class="clear"></div>
+            {{--广告--}}
+            @if($ads && array_key_exists('AIX_indextopimg',$ads))
+                <div class="swiper-container">
+                    <div class="swiper-wrapper">
+                        @foreach($ads['AIX_indextopimg'] as $k=>$v)
+                            <div class="swiper-slide">
+                                <a href="{{ $v->href }}" target="{{$v->target ?? '_blank'}}" title="{{ $v->title }}">
+                                    <img src="{{upload_asset($v->content)}}" border="0"/>
+                                </a>
+                            </div>
+                        @endforeach
+                    </div>
+                    <div class="swiper-pagination"></div>
+                    <div class="swiper-button-prev"></div>
+                    <div class="swiper-button-next"></div>
                 </div>
-            </div>
-            <div class="clear"></div>
+            @endif
         </div>
         <div class="home_policy_match">
             <div class="box_title">人才匹配政策</div>
@@ -342,24 +336,6 @@
 
         </div>
         <div class="clear"></div>
-
-        {{--广告--}}
-        @if($ads && array_key_exists('AIX_indextopimg',$ads))
-            <div class="swiper-container" style="margin-top:20px;">
-                <div class="swiper-wrapper">
-                    @foreach($ads['AIX_indextopimg'] as $k=>$v)
-                        <div class="swiper-slide">
-                            <a href="{{ $v->href }}" target="{{$v->target ?? '_blank'}}" title="{{ $v->title }}">
-                                <img src="{{upload_asset($v->content)}}" border="0"/>
-                            </a>
-                        </div>
-                    @endforeach
-                </div>
-                <div class="swiper-pagination"></div>
-                <div class="swiper-button-prev"></div>
-                <div class="swiper-button-next"></div>
-            </div>
-        @endif
         {{--<div class="aix-ad-1200-160">
             @if($ads && array_key_exists('AIX_indextopimg',$ads))
                 @foreach($ads['AIX_indextopimg'] as $k=>$v)
@@ -386,23 +362,8 @@
         <!--聚才动态-->
         <div class="home_jucai_trends">
             <div class="home_title">
-                <div class="title_ch">聚才动态</div>
-                <div class="title_en">JUCAI&nbsp;TRENDS</div>
-            </div>
-            <div class="active_trends">
-                <div class="classify_item active">人才新闻</div>
-                <div class="classify_item">招考报名</div>
-                <script>
-                    $(".active_trends .classify_item").click(function () {
-                        if (!$(this).hasClass("active")) {
-                            $(this).addClass("active").siblings().removeClass("active");
-                            var index = $(this).index();
-                            $(".trends_box").css("display", "none");
-                            $(".trends_box").eq(index).css("display", "block");
-                        }
-                    })
-                </script>
-                <div class="clear"></div>
+                <div class="title_ch">招聘资讯</div>
+                <div class="title_en">RECRUIT&nbsp;INFORMATION</div>
             </div>
             <div class="trends_box">
                 <div class="home_pic_news">
@@ -805,7 +766,7 @@
 
 
     <!--人才风采-->
-    <div class="home_personal_appearance">
+    {{--<div class="home_personal_appearance">
         <div class="home_title">
             <div class="title_ch">人才风采</div>
             <div class="title_en">TALENT&nbsp;STYLE</div>
@@ -842,7 +803,7 @@
                 </div>
             </div>
         </div>
-    </div>
+    </div>--}}
 @endsection
 
 

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

@@ -266,14 +266,14 @@
     <!--新闻-->
     <div class="module">
         <div class="module-title font14">
-            <a href="javascript:;" class="module-title-nav font14 active f-left" id="emer">聚才动态</a>
-            <a href="javascript:;" class="module-title-nav font14 f-left" id="recom">工作动态</a>
+            <a href="javascript:;" class="module-title-nav font14 active f-left" id="emer">单位招聘</a>
+            <a href="javascript:;" class="module-title-nav font14 f-left" id="recom">公告公示</a>
             <div class="clear"></div>
         </div>
         <div class="mobile_index_news" id="emergency">
             <ul>
-                @if(array_has($articles1, '3') && $articles1['3'])
-                    @foreach($articles1['3'] as $k=>$v)
+                @if(array_has($articles1, '59') && $articles1['59'])
+                    @foreach($articles1['59'] as $k=>$v)
                         <li>
                             @if(empty($v->is_url))
                                 <a href="{{route('mobile.news.show',['id'=>$v->id])}}" target="_blank"><b>&gt;</b>{{cut_str($v->title, 15, 0, '...')}}<span class="jc_rt">{{date('Y-m-d',strtotime($v->created_at))}}</span></a>
@@ -290,8 +290,8 @@
         </div>
         <div class="mobile_index_news" id="recommend">
             <ul>
-                @if(array_has($articles2, '2') && $articles2['2'])
-                    @foreach($articles2['2'] as $k=>$v)
+                @if(array_has($articles2, '58') && $articles2['58'])
+                    @foreach($articles2['58'] as $k=>$v)
                         <li>
                             <a href="{{route('mobile.news.show',['id'=>$v->id])}}" target="_blank"><b class="b2"></b>{{cut_str($v->title, 25, 0, '...')}}</a>
                         </li>