Merge remote-tracking branch 'origin/master'

app/Admin/Controllers/Company/CompanyController.php

@@ -352,6 +352,8 @@ class CompanyController extends Controller
                     }
                     $filter->equal('companyConsultant.consultant_id', '顾问')->select($arr_con);
                 }
+
+                $filter->equal('is_health', '卫健系统')->select(['1'=>'是', '2'=>'否']);
             });
         });
         if (Admin::user()->can('company_manager_create')) {
@@ -584,6 +586,7 @@ EOT;
             //企业性质给定数组
             $com_type = Category::categoryType('AIX_company_type');
             $form->radio('nature', '企业性质')->options($com_type)->default(key($com_type))->setMustMark();
+            $form->radio('is_health', '卫健系统')->options([1 => '是', 2 => '否'])->default(2);
             $form->radio('is_jkq', '属于经济开发区')->options([1 => '是', 2 => '否'])->default(2);
             $form->select('trade', '所属行业')->options(Category::categoryType('AIX_trade'))->setWidth(3)->rules('required', ['required' => '请选择相应的企业所属行业'])->setMustMark();
             $form->select('province', '所属省份')->options(CategoryDistrict::List()->pluck('name', 'id'))->setWidth(3)->load('city', admin_base_path("/sys/category/categoryDis"))->rules('required', ['required' => '请选择相应的企业所属省份'])->setMustMark();
@@ -825,7 +828,8 @@ EOT;
             //企业性质给定数组
             $nature = Category::categoryType('AIX_company_type');
             $form->radio('nature', '企业性质')->options($nature)->default(key($nature))->rules(['required'], ['required' => '请选择相应的企业性质'])->setMustMark();
-            $form->radio('is_jkq', '属于经济开发区')->options([1 => '是', 2 => '否'])->default(2);;
+            $form->radio('is_health', '卫健系统')->options([1 => '是', 2 => '否'])->default(2);
+            $form->radio('is_jkq', '属于经济开发区')->options([1 => '是', 2 => '否'])->default(2);
             $form->select('trade', '所属行业')->options(Category::categoryType('AIX_trade'))->setWidth(3)->rules('required', ['required' => '请选择相应的企业所属行业'])->setMustMark();
             //单位性质
 //            $unit_character = Category::categoryType('AIX_company_type');

app/Admin/Controllers/Company/JobsController.php

@@ -261,6 +261,7 @@ ETO;
                     }
                 }, '推广类型', 'promotion')->select([0 => '不限', 1 => '未推广', 2 => '置顶', 3 => '紧急'])->default('0');
                 $filter->equal('valid', '有效状态')->select(['0'=>'无效职位', '1'=>'有效职位']);
+                $filter->equal('is_health', '卫健系统')->select(['1'=>'是', '2'=>'否']);
             });
             $filter->column(1/2, function ($filter) {
                 $filter->equal('id', '职位ID');
@@ -570,8 +571,9 @@ ETO;
                 $experience['0']="不限";
                 $form->radio('experience', '工作经验')->options($experience);
                 $form->radio('sex', '性别要求')->options([0=>'不限',1=>'男',2=>'女']);
-                $form->radio('is_deformity', '是否接受残疾人')->options([1=>'是',2=>'否']);
-                $form->radio('is_soldier', '是否接受退役军人')->options([1=>'是',2=>'否']);
+                $form->radio('is_health', '卫健系统')->options([1=>'是',2=>'否'])->default(2);
+                $form->radio('is_deformity', '是否接受残疾人')->options([1=>'是',2=>'否'])->default(2);
+                $form->radio('is_soldier', '是否接受退役军人')->options([1=>'是',2=>'否'])->default(2);
 
                 $form->number('min_age', '最低年龄')->default(isset($jobsData['age'][0])?$jobsData['age'][0]:'')->min(16)->max(65)->help('最低年龄不能低于国家规定用工年龄');
                 $form->number('max_age', '最高年龄')->default(isset($jobsData['age'][1])?$jobsData['age'][1]:'')->min(16)->max(65)->help('最高年龄不能高于65周岁');

app/Http/Controllers/Mobile/Content/JobsController.php

@@ -179,9 +179,10 @@ class JobsController extends MobileBaseController
                 $show_login_notice = 1;
                 $list_limit = config('aix.companyset.search_com.search_basic.jobs_search_num_login');
             }
-
+            $where[] = ['is_health','=',1];
             $size = 20;
             $list = $this->searchService->search('Job', $where, $order_by, $search_key, $size);
+            dd($list);
             if ($list->total()>0) {
                 $list_items = $this->jobsService->dealjobFilelds($list->items(), $map_data);
             } else {

app/Http/Controllers/Mobile/Health/IndexController.php

@@ -10,4 +10,14 @@ class IndexController extends MobileBaseController
     {
         return view('mobile.app.health.index');
     }
+
+    public function jinjiang()
+    {
+        return view('mobile.app.health.jinjiang');
+    }
+
+    public function policy()
+    {
+        return view('mobile.app.health.policy');
+    }
 }

app/Http/Controllers/Web/Company/JobsController.php

@@ -180,13 +180,14 @@ class JobsController extends WebBaseController
      */
     public function jobsSave(JobsValidatorRequest $request)
     {
-        $user             = auth('web-company')->user();
-        $data             = $request->except('_token', '_method');
-        $data['wage_min'] = empty($data['wage_min']) ? 0 : $data['wage_min'];
-        $data['wage_max'] = empty($data['wage_max']) ? 0 : $data['wage_max'];
-        $data['map_x']    = empty($data['map_x']) ? '' : $data['map_x'];
-        $data['map_y']    = empty($data['map_y']) ? '' : $data['map_y'];
+        $user                 = auth('web-company')->user();
+        $data                 = $request->except('_token', '_method');
+        $data['wage_min']     = empty($data['wage_min']) ? 0 : $data['wage_min'];
+        $data['wage_max']     = empty($data['wage_max']) ? 0 : $data['wage_max'];
+        $data['map_x']        = empty($data['map_x']) ? '' : $data['map_x'];
+        $data['map_y']        = empty($data['map_y']) ? '' : $data['map_y'];
         $data['is_deformity'] = empty($data['is_deformity']) ? 2 : $data['is_deformity'];
+        $data['is_health']    = $user['is_health'];
         return $this->jobsService->jobsSave($data, $user);
     }
 

app/Services/Common/SearchService.php

@@ -748,6 +748,7 @@ class SearchService
                             } elseif ($v[1] == 'like') {
                                 $list->where($v[0], $v[2]);
                             }
+
                         }
 
                     } else {
@@ -760,8 +761,12 @@ class SearchService
                         } elseif ($v[0] == 'range') {
                             $map_filter['distance'] = $v[2] . 'km';
                         } else {
+                            if ($v[0] == 'is_health') {
+//                                dd($v);
+                            }
                             $list->where($v[0], $v[2]);
                         }
+
                     }
                 }
 

public/themes/default/views/mobile/app/health/hospital/show.blade.php

@@ -1,4 +1,4 @@
-@extends('mobile.module.layouts.empty')
+@extends('mobile.module.layouts.health')
 @push('meta')
 
 @endpush

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

@@ -55,12 +55,12 @@
     </div>
 {{--    导航按钮--}}
     <div class="nav-list">
-        <a href="{{route('mobile.health.teach.index')}}" class="nav purple">宣讲会/招聘会报名</a>
-        <a href="{{route('mobile.health.introduce.index')}}" class="nav blue">卫健风采</a>
-        <a href="{{route('mobile.health.hospital.index')}}" class="nav red">医院列表</a>
+        <a href="{{route('mobile.health.jinjiang')}}" class="nav blue">认识晋江</a>
+        <a href="{{route('mobile.health.hospital.index')}}" class="nav red">医院概况</a>
         <a href="{{route('mobile.health.recruit.index')}}" class="nav yellow">招聘列表</a>
-        <a href="https://rcmap.jucai.gov.cn/mobile/pages/policy/search" class="nav green">政策超市</a>
-        <a href="https://lw_test.jinjianghc.com/mobile/jfm/policy1.html" class="nav black">服务事项</a>
+        <a href="{{route('mobile.health.teach.index')}}" class="nav purple">宣讲会/招聘会报名</a>
+        <a href="{{route('mobile.health.policy')}}" class="nav green">人才政策</a>
+        <a href="https://lw_test.jinjianghc.com/mobile/jfm/policy1.html" class="nav black">人才服务</a>
     </div>
 
 <!--新闻-->

public/themes/default/views/mobile/app/health/jinjiang.blade.php

@@ -0,0 +1,88 @@
+@extends('mobile.module.layouts.health')
+@push('meta')
+
+@endpush
+
+@push('css')
+    <link href="{{ theme_asset('mobile/css/index.css') }}" rel="stylesheet">
+    <style>
+        .img-box,.img-box img {display: block;width:100%;}
+        .module-title .module-title-nav{
+            display:block;
+            float:left;
+            color: #666666;
+            text-align: center;
+            height: .8rem;
+            width: 25%;
+            line-height: .8rem;
+            text-decoration: none;
+        }
+        .module-title-content {background: white;padding:10px;width: 100%;box-sizing: border-box;}
+    </style>
+@endpush
+
+@push('js')
+
+@endpush
+
+@section('content')
+    {{--    头部--}}
+    <div class="headernavfixed">
+        <div class="headernav font18">
+            <div class="title">
+                <div class="n-tit-box">
+                    认识晋江
+                </div>
+                <div class="return js-back for-event" data-href="{{route('mobile.health.index')}}"></div>
+            </div>
+        </div>
+    </div>
+    
+    <div class="img-box">
+        <img src="/themes/default/assets/mobile/images/health/jinjiang1.png" alt="">
+        <img src="/themes/default/assets/mobile/images/health/jinjiang2.png" alt="">
+        <img src="/themes/default/assets/mobile/images/health/jinjiang3.png" alt="">
+        <img src="/themes/default/assets/mobile/images/health/jinjiang4.png" alt="">
+        <img src="/themes/default/assets/mobile/images/health/jinjiang5.png" alt="">
+        <img src="/themes/default/assets/mobile/images/health/jinjiang8.png" alt="">
+        <img src="/themes/default/assets/mobile/images/health/jinjiang9.png" alt="">
+        <img src="/themes/default/assets/mobile/images/health/jinjiang10.png" alt="">
+        <img src="/themes/default/assets/mobile/images/health/jinjiang11.png" alt="">
+        <img src="/themes/default/assets/mobile/images/health/jinjiang7.png" alt="">
+    </div>
+    <div class="module">
+        <div class="module-title font14">
+            <a href="javascript:;" class="module-title-nav font14 active f-left" data-name="commerce">商贸物流</a>
+            <a href="javascript:;" class="module-title-nav font14 f-left" data-name="internet">互联网及信息</a>
+            <a href="javascript:;" class="module-title-nav font14 f-left" data-name="finance">金融服务</a>
+            <a href="javascript:;" class="module-title-nav font14 f-left" data-name="culture">文化旅游</a>
+            <div class="clear"></div>
+        </div>
+        <div class="module-title-content" id="commerce">
+            发展以海港、空港、陆港和出口加工区、高铁物流为龙头的现代物流服务业，拓展以物流信息和第三、第四方物流服务，完善“物流基地-分拨中心-配送中心”三位一体服务网络，巩固提升大宗货物海、陆、空、铁联运区域枢纽地位。
+        </div>
+        <div class="module-title-content" id="internet">
+            培育“互联网+”、大数据、云计算、软件开发、网络安全、系统集成等网络信息服务业，加快信息经济与产业经济、社会事业融合发展。
+        </div>
+        <div class="module-title-content" id="finance">
+            大力推进金融服务机制创新、产品创新、市场创新，拓展互联网金融、农地金融、科技金融等新型金融业态，推动金融业与实体经济融合发展。
+        </div>
+        <div class="module-title-content" id="culture">
+            规划自然生态、人文古迹、特色产业等旅游资源，深度挖掘中原文化、闽越文化、海交文化等传统文化及近代战地文化、现代工业文明的丰富内涵，打造“海丝”沿线多元文化旅游目的地。
+        </div>
+    </div>
+@endsection
+
+@section('script')
+    <script>
+        $('.module-title-content').hide();
+        $('#commerce').show();
+        $('.module-title-nav').click(function(){
+            const name = $(this).data('name');
+            $('.module-title-content').hide();
+            $('#'+name).show();
+            $('.module-title-nav').removeClass('active');
+            $(this).addClass('active');
+        });
+    </script>
+@endsection

public/themes/default/views/mobile/app/health/policy.blade.php

@@ -0,0 +1,36 @@
+@extends('mobile.module.layouts.health')
+@push('meta')
+
+@endpush
+
+@push('css')
+    <style>
+        .iframe {width:100%;height:calc(100vh - .9rem);}
+    </style>
+@endpush
+
+@push('js')
+
+@endpush
+
+@section('content')
+    {{--    头部--}}
+    <div class="headernavfixed">
+        <div class="headernav font18">
+            <div class="title">
+                <div class="n-tit-box">
+                    人才政策
+                </div>
+                <div class="return js-back for-event" data-href="{{route('mobile.health.index')}}"></div>
+            </div>
+        </div>
+    </div>
+
+    <iframe  frameborder=0 framespacing=0 marginheight=0 marginwidth=0 noResize scrolling=no vspale="0" class="iframe" src="https://rcmap.jucai.gov.cn/mobile/pages/policy/search"></iframe>
+@endsection
+
+@section('script')
+    <script>
+
+    </script>
+@endsection

public/themes/default/views/mobile/module/layouts/health.blade.php

@@ -1,3 +1,3 @@
 @include('mobile.module.section.html_start')
 @yield('content')
-@include('mobile.module.section.html_end')
+@include('mobile.module.section.html_health_end')

public/themes/default/views/mobile/module/section/html_health_end.blade.php

@@ -0,0 +1,137 @@
+<img src="/themes/default/assets/mobile/images/health/customer_service.png" style="position:fixed;right:20px;bottom:20px;width: 50px;height: 50px;">
+</body>
+<script src="{{theme_asset('mobile/js/fastclick.js')}}"></script>
+<script src="{{theme_asset('mobile/js/qsToast.js')}}"></script>
+<script src="{{theme_asset('mobile/js/QSpopout.js')}}"></script>
+<script src="{{theme_asset('mobile/js/QSfilter.js')}}"></script>
+<script src="{{theme_asset('mobile/js/scrollTo.js')}}"></script>
+<script>
+    window.addEventListener( "load", function() {
+        FastClick.attach(document.body);
+    }, false );
+</script>
+<script>
+    $('a[href]').click(function(){
+        var f = $(this).attr('href');
+        var reg = /\#(\w+)/;
+        if(reg.test(f)) {
+            if (!$(this).data('nm')) {
+                return !1;
+            }
+        }
+    });
+    $('.js-back').on('click', function () {
+        var href = $(this).data('href');
+        if (!href) {
+            history.back();
+        } else {
+            location.href = href;
+        }
+    });
+    $('.rbtn').on('click', function() {
+        forCloseNav();
+    })
+    $('.t-mask').on('click', function () {
+        forCloseNav();
+    })
+    $('.h-navclose').on('click', function () {
+        forCloseNav();
+    })
+    function forCloseNav() {
+        if ($('.topnavshow').hasClass('qs-actionsheet-toggle')) {
+            $('.t-mask').hide();
+            $('.topnavshow').removeClass('qs-actionsheet-toggle');
+        } else {
+            $('.t-mask').show();
+            $('.topnavshow').addClass('qs-actionsheet-toggle');
+        }
+    }
+    /**
+     * 监听鼠标
+     */
+    if ('ontouchstart' in window) {
+        $.EVENT_START = 'touchstart';
+        $.EVENT_END = 'touchend';
+    } else {
+        $.EVENT_START = 'mousedown';
+        $.EVENT_END = 'mouseup';
+    }
+    $('.plist-txt, .qs-btn, .for-event').on($.EVENT_START, function() {
+        $(this).addClass('eventactive');
+    })
+    $('.plist-txt, .qs-btn, .for-event').on($.EVENT_END, function() {
+        $(this).removeClass('eventactive');
+    })
+
+
+    $('.logout').on('click', function () {
+        var dialog = new QSpopout();
+        dialog.setContent('确定退出吗？');
+        forCloseNav();
+        dialog.show();
+        dialog.getPrimaryBtn().on('click', function () {
+            @if(strpos(\Illuminate\Support\Facades\Request::getRequestUri(),'/jkq') === 0)
+                window.location.href = "{{route('jkq.mobile.logout')}}";
+            @else
+                window.location.href = "{{route('mobile.logout')}}";
+            @endif
+        });
+    });
+
+    // 处理select
+    $('select').on('change', function () {
+        $(this).prev().text($(this).find('option').not(function(){ return !this.selected }).text());
+    })
+    $('select').each(function () {
+        $(this).prev().text($(this).find('option').not(function(){ return !this.selected }).text());
+    })
+
+    @php
+        $wechat = App\Wechat\WechatParam::instance();
+    @endphp
+    @if(!empty($wechat->get('signature')))
+        wx.config({
+            debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+            appId: "{{$wechat->get('appid')}}", // 必填，公众号的唯一标识
+            timestamp: "{{$wechat->get('timestamp')}}", // 必填，生成签名的时间戳
+            nonceStr: "{{$wechat->get('nonceStr')}}", // 必填，生成签名的随机串
+            signature: "{{$wechat->get('signature')}}",// 必填，签名，见附录1
+            jsApiList: ['updateAppMessageShareData','updateTimelineShareData','openLocation'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+        });
+    wx.checkJsApi({
+        jsApiList: ['updateAppMessageShareData','updateTimelineShareData','openLocation'], // 需要检测的JS接口列表，所有JS接口列表见附录2,
+        success: function(res) {
+            console.log(res);
+            // 以键值对的形式返回，可用的api值true，不可用为false
+            // 如：{"checkResult":{"chooseImage":true},"errMsg":"checkJsApi:ok"}
+        }
+    });
+        wx.ready(function () {
+            wx.updateAppMessageShareData({
+                title: '{{empty($share_title) ? '聚才网' : $share_title}}', // 分享标题
+                desc: '{{empty($share_desc) ? '' : $share_desc}}', // 分享描述
+                link: '{{empty($share_link) ? Illuminate\Support\Facades\Request::url() : $share_link}}', // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+                imgUrl: '{{empty($share_image_url) ? theme_asset('mobile/images/rcg.png') : $share_image_url}}', // 分享图标
+                success: function () {
+                    // 用户确认分享后执行的回调函数
+                    if (typeof wx_share_callback === 'function') {
+                        wx_share_callback('message');
+                    }
+                }
+            });
+            wx.updateTimelineShareData({
+                title: '{{empty($share_title) ? '聚才网' : $share_title}}', // 分享标题
+                link: '{{empty($share_link) ? Illuminate\Support\Facades\Request::url() : $share_link}}', // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+                imgUrl: '{{empty($share_image_url) ? theme_asset('mobile/images/rcg.png') : $share_image_url}}', // 分享图标
+                success: function () {
+                    // 用户确认分享后执行的回调函数
+                    if (typeof wx_share_callback === 'function') {
+                        wx_share_callback('message');
+                    }
+                }
+            })
+        });
+    @endif
+</script>
+    @yield('script')
+</html>

routes/mobile.php

@@ -616,6 +616,8 @@ Route::group([
     'prefix' => '/health',
 ], function (Router $router) {
     $router->get('/index', 'Mobile\Health\IndexController@index')->name('mobile.health.index');
+    $router->get('/jinjiang', 'Mobile\Health\IndexController@jinjiang')->name('mobile.health.jinjiang');
+    $router->get('/policy', 'Mobile\Health\IndexController@policy')->name('mobile.health.policy');
     $router->get('/teach', 'Mobile\Health\TeachController@index')->name('mobile.health.teach.index');
     $router->get('/introduce', 'Mobile\Health\IntroduceController@index')->name('mobile.health.introduce.index');
     $router->get('/introduce/show', 'Mobile\Health\IntroduceController@show')->name('mobile.health.introduce.show');