Merge remote-tracking branch 'origin/master'

public/themes/default/views/mobile/app/health/recruit/list.blade.php

@@ -58,20 +58,9 @@
 
 
     {{--过滤条件--}}
-    <div class="filter-group x4 filter-outer">
+    <div class="filter-group x3 filter-outer">
         <div id="f-mask"></div>
         <div class="filter-outer">
-            <div class="filter-list js-filter qs-temp filter-nearby" data-tag="0" data-type="city" data-base="QS_city_parent" data-source="QS_city" data-multiple="false" data-num="3" data-link="true" data-range="true" data-level="{{config('aix.system.site_other.site_other.category_district_level')}}">
-                <div class="filter-cell">
-                    <div class="filter-cell-txt qs-temp-txt-city">
-                        @if(array_get($params,'citycategory')=='')
-                            地区
-                        @else
-                            {{ $city['select']['name'] }}
-                        @endif
-                    </div>
-                </div>
-            </div>
             <div class="filter-list js-filter" data-tag="1">
                 <div class="filter-cell">
                     <div class="filter-cell-txt f-normal-txt-wage">
@@ -96,32 +85,27 @@
             </div>
             <div class="filter-list js-filter" data-tag="3">
                 <div class="filter-cell">
-                    <div class="filter-cell-txt j-change-color">
-                        更多
+                    <div class="filter-cell-txt f-normal-txt-eduction">
+                        @if(array_get($params,'eduction')=='')
+                            学历
+                        @else
+                            {{ $categories['AIX_eduction'][$params['eduction']]['demand'] }}
+                        @endif
                     </div>
                 </div>
             </div>
 
+
             <div class="clear"></div>
 
             <div class="qs-actionmore"></div>
 
             <form id="searchForm" action="" method="get">
                 <input type="hidden" class="" name="search_type" value="jobs_name">
-                <input type="hidden" class="" name="keyword" value="@if(array_get($params, 'keyword')){{urldecode(urldecode(array_get($params, 'keyword')))}}@endif">
-                <input type="hidden" class="qs-recover-code-job" name="jobcategory" value="{{$params['jobcategory'] or ''}}">
-                <input type="hidden" class="qs-temp-code-city" name="citycategory" value="{{$params['citycategory'] or ''}}">
+                <input type="hidden" class="" name="keyword" value="@if(array_get($params, 'keyword')){{array_get($params, 'keyword')}}@endif">
                 <input type="hidden" class="f-normal-code-wage" name="wage" value="{{$params['wage'] or ''}}">
                 <input type="hidden" class="f-normal-code-experience" name="experience" value="{{$params['experience'] or ''}}">
-                <input type="hidden" class="f-more-l-code-nature" name="nature" value="{{$params['nature'] or ''}}">
                 <input type="hidden" class="f-more-l-code-education" name="education" value="{{$params['education'] or ''}}">
-                <input type="hidden" class="f-more-l-code-jobtag" name="jobtag" value="{{$params['jobtag'] or ''}}">
-                <input type="hidden" class="f-more-l-code-trade" name="trade" value="{{$params['trade'] or ''}}">
-                <input type="hidden" class="f-more-l-code-settr" name="settr" value="{{$params['settr'] or ''}}">
-                <input type="hidden" class="f-deliver" name="deliver" value="{{$params['deliver'] or ''}}">
-                <input type="hidden" class="qs-temp-code-range" name="range" value="{{$params['range'] or ''}}">
-                <input type="hidden" class="range-lng" name="range-lng" id="range-lng" value="{{session('range-lng')}}">
-                <input type="hidden" class="range-lat" name="range-lat" id="range-lat" value="{{session('range-lat')}}">
             </form>
         </div>
         <div class="con-filter">
@@ -162,189 +146,27 @@
                     </div>
                 </div>
             </div>
-            <div class="f-box f-box-more">
-                <div class="f-box-inner">
-                    <ul class="arrow">
-                        <li class="clicked">
-                            过滤已投递<span><span class="clickedbox js-clickedbox"></span></span>
-                        </li>
-                        <li>
-                            <a href="javascript:;" data-id="filter-nature" class="js-more-l">
-                                工作性质
-                                <span class="choice f-more-l-txt-nature">
-                                    @if(array_get($params, 'nature')){{$categories['AIX_jobs_nature'][$params['nature']]['demand']}}@else{{ '不限' }}@endif
-                                </span>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="javascript:;" data-id="filter-education" class="js-more-l">
-                                学历要求
-                                <span class="choice f-more-l-txt-education">
-                                    @if(array_get($params, 'education')){{$categories['AIX_education'][$params['education']]['demand']}}@else{{ '不限' }}@endif
-                                </span>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="javascript:;" data-id="filter-jobtag" class="js-more-l">
-                                福利待遇
-                                <span class="choice f-more-l-txt-jobtag">
-                                    @if(array_get($params, 'jobtag')){{$categories['AIX_jobtag'][$params['jobtag']]['demand']}}@else{{ '不限' }}@endif
-                                </span>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="javascript:;" data-id="filter-trade" class="js-more-l">
-                                行业
-                                <span class="choice f-more-l-txt-trade">
-                                    @if(array_get($params, 'trade')){{$categories['AIX_trade'][$params['trade']]['demand']}}@else{{ '不限' }}@endif
-                                </span>
-                            </a>
-                        </li>
-                        <li><a href="javascript:;" data-id="filter-settr" class="js-more-l">
-                                更新时间
-                                <span class="choice f-more-l-txt-settr">
-                                    @if(array_get($params,'settr')>0)
-                                        {{$params['settr']}}天内
-                                    @else
-                                        不限
-                                    @endif
-                                </span>
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-                <div class="f-btn-submit qs-center">
-                    <div href="javascript:;" class="qs-btn qs-btn-inline qs-btn-medium qs-btn-orange" id="f-do-filter"> 确 定 </div>
-                    &nbsp;&nbsp;&nbsp;
-                    <div onclick="window.location='{{route("mobile.health.recruit.list")}}';" class="qs-btn qs-btn-inline qs-btn-medium qs-btn-border-gray"> 清空所选 </div>
-                </div>
-                <div class="f-btn-back qs-center">
-                    <div href="javascript:;" class="qs-btn qs-btn-inline qs-btn-medium qs-btn-orange f-more-back-btn"> 返 回 </div>
-                </div>
-            </div>
-            <div class="f-box f-more-content" id="filter-nature">
-                <div class="f-box-inner">
-                    <ul>
-                        <li class="selected">
-                            <a href="javascript:;" class="f-more-back-a @if(array_get($params,'nature')=='0') select @endif" data-type="nature" data-title="不限" data-code="0">
-                            不限
-                            </a>
-                        </li>
-                        @if($categories['AIX_jobs_nature'])
-                            @foreach($categories['AIX_jobs_nature'] as $k=>$v)
-                                <li class="selected">
-                                    <a href="javascript:;" class="f-more-back-a @if(array_get($params,'nature')==$v['id']) select @endif" data-type="nature" data-title="{{$v['demand']}}" data-code="{{$v['id']}}">
-                                        {{$v['demand']}}
-                                    </a>
-                                </li>
-                            @endforeach
-                        @endif
-                    </ul>
-                </div>
-            </div>
-            <div class="f-box f-more-content" id="filter-education">
-                <div class="f-box-inner">
-                    <ul>
-                        <li class="selected">
-                            <a href="javascript:;" class="f-more-back-a @if(array_get($params,'education')=='0') select @endif" data-type="education" data-title="不限" data-code="0">
-                            不限
-                            </a>
-                        </li>
-                        @if($categories['AIX_education'])
-                            @foreach($categories['AIX_education'] as $k=>$v)
-                                <li class="selected">
-                                    <a href="javascript:;" class="f-more-back-a @if(array_get($params,'education')==$v['id']) select @endif" data-type="education" data-title="{{$v['demand']}}" data-code="{{$v['id']}}">
-                                        {{$v['demand']}}
-                                    </a>
-                                </li>
-                            @endforeach
-                        @endif
-                    </ul>
-                </div>
-            </div>
-            <div class="f-box f-more-content" id="filter-jobtag">
-                <div class="f-box-inner">
-                    <ul>
-                        <li class="selected">
-                            <a href="javascript:;" class="f-more-back-a @if(array_get($params,'jobtag')=='0') select @endif" data-type="jobtag" data-title="不限" data-code="0">
-                            不限
-                            </a>
-                        </li>
-                        @if($categories['AIX_jobtag'])
-                            @foreach($categories['AIX_jobtag'] as $k=>$v)
-                                <li class="selected">
-                                    <a href="javascript:;" class="f-more-back-a @if(array_get($params,'jobtag')==$v['id']) select @endif" data-type="jobtag" data-title="{{$v['demand']}}" data-code="{{$v['id']}}">
-                                        {{$v['demand']}}
-                                    </a>
-                                </li>
-                            @endforeach
-                        @endif
-                    </ul>
-                </div>
-            </div>
-            <div class="f-box f-more-content" id="filter-trade">
+            <div class="f-box f-box-experience">
                 <div class="f-box-inner">
-                    <ul>
-                        <li class="selected">
-                            <a href="javascript:;" class="f-more-back-a @if(array_get($params,'trade')=='0') select @endif" data-type="trade" data-title="不限" data-code="0">
-                            不限
-                            </a>
-                        </li>
-                        @if($categories['AIX_trade'])
-                            @foreach($categories['AIX_trade'] as $k=>$v)
-                                <li class="selected">
-                                    <a href="javascript:;" class="f-more-back-a @if(array_get($params,'trade')==$v['id']) select @endif" data-type="trade" data-title="{{$v['demand']}}" data-code="{{$v['id']}}">
+                    @if($categories['AIX_education'])
+                        @foreach($categories['AIX_education'] as $k=>$v)
+                            <li>
+                                <a class="f-item f-item-normal @if(array_get($params,'education')==$v['id']) select @endif" href="javascript:;" data-type="education" data-code="{{$v['id']}}" data-title="{{$v['demand']}}">
                                     {{$v['demand']}}
-                                    </a>
-                                </li>
-                            @endforeach
-                        @endif
-                    </ul>
+                                </a>
+                            </li>
+                        @endforeach
+                    @endif
                 </div>
-            </div>
-            <div class="f-box f-more-content" id="filter-settr">
-                <div class="f-box-inner">
-                    <ul>
-                        <li class="selected">
-                            <a href="javascript:;" class="f-more-back-a @if(!array_get($params,'settr'))select @endif" data-type="settr" data-title="不限" data-code="0">
-                            不限
-                            </a>
-                        </li>
-                        <li class="selected">
-                            <a href="javascript:;" class="f-more-back-a @if(array_get($params,'settr') == 3)select @endif" data-type="settr" data-title="3天内" data-code="3">
-                            3天内
-                            </a>
-                        </li>
-                        <li class="selected">
-                            <a href="javascript:;" class="f-more-back-a @if(array_get($params,'settr') == 7)select @endif" data-type="settr" data-title="7天内" data-code="7">
-                            7天内
-                            </a>
-                        </li>
-                        <li class="selected">
-                            <a href="javascript:;" class="f-more-back-a @if(array_get($params,'settr') == 15)select @endif" data-type="settr" data-title="15天内" data-code="15">
-                            15天内
-                            </a>
-                        </li>
-                        <li class="selected">
-                            <a href="javascript:;" class="f-more-back-a @if(array_get($params,'settr') == 30)select @endif" data-type="settr" data-title="30天内" data-code="30">
-                            30天内
-                            </a>
-                        </li>
-                    </ul>
+                <div class="f-btn-submit qs-center">
+                    <div onclick="window.location='{{route("mobile.health.recruit.list",array_merge($params, array("experience"=>"")))}}';" class="qs-btn qs-btn-inline qs-btn-medium qs-btn-orange">
+                        不限
+                    </div>
                 </div>
             </div>
         </div>
     </div>
 
-    @if(array_has($params, 'jobcategory') && $params['jobcategory'])
-        <div class="list-jobcategory-block font13">
-            <div class="l-recover-job-txt">
-                当前在  <span class="l-cetgory">{{$job_category['spell'][$params['jobcategory']]['name']}}</span> 分类下
-            </div>
-            <div class="l-recover-close js-clearjob-jobcategory">清空分类</div>
-        </div>
-    @endif
-
     {{--职位列表--}}
     <div class="drop_content">
         <div class="add_data">