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

app/Admin/Controllers/Recruit/RecruitController.php

@@ -744,11 +744,13 @@ class RecruitController extends Controller
                 $data->material = json_decode($data->material);
                 $photo_data = [];
                 foreach ($data->material as $k => $v) {
-                    $photo_data[] = [
-                        'alt' => $v->name,
-                        'pid' => $v->uid,
-                        'src' => $v->response->path,
-                    ];
+                    if($v->status){
+                        $photo_data[] = [
+                            'alt' => $v->name,
+                            'pid' => $v->uid,
+                            'src' => $v->response->path,
+                        ];
+                    }
                 }
                 $photos['material'] = [
                     'title' => '申请加分佐证材料',
@@ -765,11 +767,13 @@ class RecruitController extends Controller
                 $data->identification = json_decode($data->identification);
                 $photo_data = [];
                 foreach ($data->identification as $k => $v) {
-                    $photo_data[] = [
-                        'alt' => $v->name,
-                        'pid' => $v->uid,
-                        'src' => $v->response->path,
-                    ];
+                    if($v->status){
+                        $photo_data[] = [
+                            'alt' => $v->name,
+                            'pid' => $v->uid,
+                            'src' => $v->response->path,
+                        ];
+                    }
                 }
                 $photos['identification'] = [
                     'title' => '身份证明',
@@ -786,11 +790,13 @@ class RecruitController extends Controller
                 $data->education_certification = json_decode($data->education_certification);
                 $photo_data = [];
                 foreach ($data->education_certification as $k => $v) {
-                    $photo_data[] = [
-                        'alt' => $v->name,
-                        'pid' => $v->uid,
-                        'src' => $v->response->path,
-                    ];
+                    if($v->status){
+                        $photo_data[] = [
+                            'alt' => $v->name,
+                            'pid' => $v->uid,
+                            'src' => $v->response->path,
+                        ];
+                    }
                 }
                 $photos['education_certification'] = [
                     'title' => '学历证明',
@@ -807,11 +813,13 @@ class RecruitController extends Controller
                 $data->other_certification = json_decode($data->other_certification);
                 $photo_data = [];
                 foreach ($data->other_certification as $k => $v) {
-                    $photo_data[] = [
-                        'alt' => $v->name,
-                        'pid' => $v->uid,
-                        'src' => $v->response->path,
-                    ];
+                    if($v->status){
+                        $photo_data[] = [
+                            'alt' => $v->name,
+                            'pid' => $v->uid,
+                            'src' => $v->response->path,
+                        ];
+                    }
                 }
                 $photos['other_certification'] = [
                     'title' => '其他证明',
@@ -1048,8 +1056,8 @@ class RecruitController extends Controller
         $appoint_id = $request->appoint_id;
         if(!empty($recruit_id) && !empty($appoint_id)){
 
-            $this->fetch_word(['recruit_id'=>$recruit_id,'appoint_id'=>$appoint_id]);
-            return response()->json(['status' => 1, 'msg' => '生成Word简历成功！', 'data' => 'ok']);
+            $url = $this->fetch_word(['recruit_id'=>$recruit_id,'appoint_id'=>$appoint_id]);
+            return response()->json(['status' => 1, 'msg' => '生成Word简历成功！', 'data' => 'ok', 'url' => $url]);
         }else{
             return response()->json(['status' => 0, 'msg' => '参数缺失！', 'data' => 'fail']);
         }
@@ -1294,6 +1302,7 @@ class RecruitController extends Controller
             $appoint->word_url = "/storage/recruit/word/" . $recruit->name_en .$word_url;
             $appoint->save();
             $templateProcessor->saveAs(base_path() . "/storage/app/public/recruit/word/" . $recruit->name_en . $word_url);//另存为
+            return "/storage/recruit/word/" . $recruit->name_en .$word_url;
         }
     }
 

app/Http/Controllers/Web/HomeController.php

@@ -129,19 +129,19 @@ class HomeController extends WebBaseController
         );
         $ads = $this->homeService->getAds($filter_data);
 
-        $seatmeal_companies = [];
-        $seatmeal_arr = array(
-            0 => '',
-            1 => '14',
-            2 => '11',
-            3 => '26,27,28',
-            4 => '13,35,153',
-            5 => '25',
-            6 => '3,4,6,9,10,16,17,20,21,25,28,30,31,34,36,37,40,41,44,45,151,165,213,314'
-        );
-        foreach ($seatmeal_arr as $key => $val) {
-            $seatmeal_companies[]= $this->companyService->getSetmailCompanies(array('trade'=>$val));
-        }
+//        $seatmeal_companies = [];
+//        $seatmeal_arr = array(
+//            0 => '',
+//            1 => '14',
+//            2 => '11',
+//            3 => '26,27,28',
+//            4 => '13,35,153',
+//            5 => '25',
+//            6 => '3,4,6,9,10,16,17,20,21,25,28,30,31,34,36,37,40,41,44,45,151,165,213,314'
+//        );
+//        foreach ($seatmeal_arr as $key => $val) {
+//            $seatmeal_companies[]= $this->companyService->getSetmailCompanies(array('trade'=>$val));
+//        }
 
 
         $links_logo = $this->getLinks('AIX_index', '2', '18');
@@ -290,7 +290,7 @@ class HomeController extends WebBaseController
             'time' => $time,
             'notices' => $notices,
             'articles' => $articles,
-            'seatmeal_companies' => $seatmeal_companies,
+            //'seatmeal_companies' => $seatmeal_companies,
             'am_pm' => $am_pm,
             'isSign' => $isSign,
             'jobs_meanwhile' => $jobs_meanwhile,

app/Http/Controllers/Web/Recruit/IndexController.php

@@ -675,7 +675,7 @@ class IndexController extends WebBaseController
             $msg = $validator->errors()->all();
             return response()->json(['status' => 0,'msg' => $msg[0]]);
         }else{
-            $data = $request->only('realname','sex','birthday','avatar','nation','native_place','political_affiliation','titles','join_time','work','house_register','education','school','degree','pro','address','card','mobile','email','concat_name','concat_mobile','resume','post_id','adjust');
+            $data = $request->only('realname','sex','birthday','avatar','nation','native_place','political_affiliation','titles','join_time','work','house_register','education','school','degree','pro','address','card','mobile','email','concat_name','concat_mobile','resume','post_id','adjust','remark');
             //身份证判断出生日期和性别
             $year = substr($data['card'],6,4);
             $month = substr($data['card'],10,2);

config/aix.php

@@ -187,9 +187,9 @@ return [
                 /*开启验证码--*/
                 'captcha_open' => '1',
                 /*验证码ID--*/
-                'captcha_id' => '337d0f0fb566017ef43dc40a281b7fa4',
+                'captcha_id' => 'c9fe47f6608370d03c971e014279bcca',
                 /*验证码key--*/
-                'captcha_key' => 'caae10d045187ed16def6ae6e90a3012',
+                'captcha_key' => 'b7df8cbda17a245af944c7e75f936a8b',
                 /*会员登录--如设置为3，则错误3次才发起验证*/
                 'members_login' => '4',
                 /*后台登录--如设置为3，则错误3次才发起验证*/

public/themes/default/views/app/content/article/list.blade.php

@@ -66,9 +66,15 @@
                         </div>
                         <div class="br link_gray6">
                             <div class="t substring">
+                                @if(empty($v->is_url))
                                 <a  href="{{route('news.show',['id'=>$v->id])}}">
                                     {!! $v->title !!}
                                 </a>
+                                @else
+                                    <a  href="{{$v->is_url}}">
+                                        {!! $v->title !!}
+                                    </a>
+                                @endif
                             </div>
                             <div class="time substring">
 

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

@@ -802,389 +802,7 @@
         </div>
     </div>
 
-    <!--企业招聘-->
-    <div class="home_famous_recruit">
-        <div class="wide">
-            <div class="home_title">
-                <div class="title_ch">企业招聘</div>
-                <div class="title_en">ENTERPRISE&nbsp;RECRUITMENT</div>
-                <a class="title_more" href="{{route('jobs')}}">更多+</a>
-            </div>
-            <div class="home_latestjobs_trade">
-                <span class="cur">纺织服装</span>
-                <span>制鞋</span>
-                <span>陶瓷建材</span>
-                <span>食品饮料</span>
-                <span>纸制品及包装印刷</span>
-                <span>其他</span>
-            </div>
-
-            <div class="new-tab-content">
-                <div class="jobs_group tab-box1">
-                    <div class="J_change_result">
-                        <div class="top_ad">
-                            @if($ads && array_key_exists('index_famous1',$ads))
-                                <ul>
-                                    @foreach($ads['index_famous1'] as $k=>$v)
-                                        <li class="ad_item">
-                                            <a href="{{ $v->href }}" target="_blank" title="{{ $v->title }}">
-                                                <img src="{{upload_asset($v->content)}}" border="0"/>
-                                            </a>
-                                        </li>
-                                    @endforeach
-                                </ul>
-                                <div class="clear"></div>
-                            @endif
-                        </div>
-
-                        @if(isset($seatmeal_companies[1]) && !empty($seatmeal_companies[1]))
-                            @foreach($seatmeal_companies[1] as $k=>$v)
-                                <div class="index_company_item comtip">
-                                    <div class="item-detail">
-                                        <div class="line-one">
-                                            <span class="salary">{{$v->wage_cn}}</span>
-                                            <div class="jobs_name substring">
-                                                <a target="_blank"
-                                                   href="{{$v->jobs_url}}">
-                                                    {{$v->jobs_name}}
-                                                </a>
-                                            </div>
-                                            <div class="clear"></div>
-                                            <div class="job_info substring">{{$v->district_cn}}
-                                                &nbsp;|&nbsp;{{$v->experience_cn}}
-                                                &nbsp;|&nbsp;{{$v->education_cn}}</div>
-                                        </div>
-                                        <div class="line-two">
-                                            <div class="company_logo  index_shadow_box">
-                                                <img src="{{ $v->logo }}" border="0"/>
-                                            </div>
-                                            <div class="company_name  substring"><a href="{{ $v->url }}" target="_blank"
-                                                                                    title="{{ $v->companyname_ }}">{{ $v->companyname_ }}</a>
-                                            </div>
-                                            <div class="clear"></div>
-                                        </div>
-                                    </div>
-                                </div>
-                            @endforeach
-                            <div class="clear"></div>
-                        @endif
-                    </div>
-                    <div class="clear"></div>
-                </div>
-                <div class="jobs_group tab-box2" style="display:none;">
-                    <div class="J_change_result">
-                        <div class="top_ad">
-                            @if($ads && array_key_exists('index_famous2',$ads))
-                                <ul>
-                                    @foreach($ads['index_famous2'] as $k=>$v)
-                                        <li class="ad_item">
-                                            <a href="{{ $v->href }}" target="_blank" title="{{ $v->title }}">
-                                                <img src="{{upload_asset($v->content)}}" border="0"/>
-                                            </a>
-                                        </li>
-                                    @endforeach
-                                </ul>
-                                <div class="clear"></div>
-                            @endif
-                        </div>
-
-                        @if(isset($seatmeal_companies[2]) && !empty($seatmeal_companies[2]))
-                            @foreach($seatmeal_companies[2] as $k=>$v)
-                                <div class="index_company_item comtip">
-                                    <div class="item-detail">
-                                        <div class="line-one">
-                                            <span class="salary">{{$v->wage_cn}}</span>
-                                            <div class="jobs_name substring">
-                                                <a target="_blank"
-                                                   href="{{$v->jobs_url}}">
-                                                    {{$v->jobs_name}}
-                                                </a>
-                                            </div>
-                                            <div class="clear"></div>
-                                            <div class="job_info substring">{{$v->district_cn}}
-                                                &nbsp;|&nbsp;{{$v->experience_cn}}
-                                                &nbsp;|&nbsp;{{$v->education_cn}}</div>
-                                        </div>
-                                        <div class="line-two">
-                                            <div class="company_logo  index_shadow_box">
-                                                <img src="{{ $v->logo }}" border="0"/>
-                                            </div>
-                                            <div class="company_name  substring"><a href="{{ $v->url }}" target="_blank"
-                                                                                    title="{{ $v->companyname_ }}">{{ $v->companyname_ }}</a>
-                                            </div>
-                                            <div class="clear"></div>
-                                        </div>
-                                    </div>
-                                </div>
-                            @endforeach
-                            <div class="clear"></div>
-                        @endif
-                    </div>
-                    <div class="clear"></div>
-                </div>
-                <div class="jobs_group tab-box3" style="display:none;">
-                    <div class="J_change_result">
-                        <div class="top_ad">
-                            @if($ads && array_key_exists('index_famous3',$ads))
-                                <ul>
-                                    @foreach($ads['index_famous3'] as $k=>$v)
-                                        <li class="ad_item">
-                                            <a href="{{ $v->href }}" target="_blank" title="{{ $v->title }}">
-                                                <img src="{{upload_asset($v->content)}}" border="0"/>
-                                            </a>
-                                        </li>
-                                    @endforeach
-                                </ul>
-                                <div class="clear"></div>
-                            @endif
-                        </div>
-
-                        @if(isset($seatmeal_companies[3]) && !empty($seatmeal_companies[3]))
-                            @foreach($seatmeal_companies[3] as $k=>$v)
-                                <div class="index_company_item comtip">
-                                    <div class="item-detail">
-                                        <div class="line-one">
-                                            <span class="salary">{{$v->wage_cn}}</span>
-                                            <div class="jobs_name substring">
-                                                <a target="_blank"
-                                                   href="{{$v->jobs_url}}">
-                                                    {{$v->jobs_name}}
-                                                </a>
-                                            </div>
-                                            <div class="clear"></div>
-                                            <div class="job_info substring">{{$v->district_cn}}
-                                                &nbsp;|&nbsp;{{$v->experience_cn}}
-                                                &nbsp;|&nbsp;{{$v->education_cn}}</div>
-                                        </div>
-                                        <div class="line-two">
-                                            <div class="company_logo  index_shadow_box">
-                                                <img src="{{ $v->logo }}" border="0"/>
-                                            </div>
-                                            <div class="company_name  substring"><a href="{{ $v->url }}" target="_blank"
-                                                                                    title="{{ $v->companyname_ }}">{{ $v->companyname_ }}</a>
-                                            </div>
-                                            <div class="clear"></div>
-                                        </div>
-                                    </div>
-                                </div>
-                            @endforeach
-                            <div class="clear"></div>
-                        @endif
-                    </div>
-                    <div class="clear"></div>
-                </div>
-                <div class="jobs_group tab-box4" style="display:none;">
-                    <div class="J_change_result">
-                        <div class="top_ad">
-                            @if($ads && array_key_exists('index_famous4',$ads))
-                                <ul>
-                                    @foreach($ads['index_famous4'] as $k=>$v)
-                                        <li class="ad_item">
-                                            <a href="{{ $v->href }}" target="_blank" title="{{ $v->title }}">
-                                                <img src="{{upload_asset($v->content)}}" border="0"/>
-                                            </a>
-                                        </li>
-                                    @endforeach
-                                </ul>
-                                <div class="clear"></div>
-                            @endif
-                        </div>
-
-                        @if(isset($seatmeal_companies[4]) && !empty($seatmeal_companies[4]))
-                            @foreach($seatmeal_companies[4] as $k=>$v)
-                                <div class="index_company_item comtip">
-                                    <div class="item-detail">
-                                        <div class="line-one">
-                                            <span class="salary">{{$v->wage_cn}}</span>
-                                            <div class="jobs_name substring">
-                                                <a target="_blank"
-                                                   href="{{$v->jobs_url}}">
-                                                    {{$v->jobs_name}}
-                                                </a>
-                                            </div>
-                                            <div class="clear"></div>
-                                            <div class="job_info substring">{{$v->district_cn}}
-                                                &nbsp;|&nbsp;{{$v->experience_cn}}
-                                                &nbsp;|&nbsp;{{$v->education_cn}}</div>
-                                        </div>
-                                        <div class="line-two">
-                                            <div class="company_logo  index_shadow_box">
-                                                <img src="{{ $v->logo }}" border="0"/>
-                                            </div>
-                                            <div class="company_name  substring"><a href="{{ $v->url }}" target="_blank"
-                                                                                    title="{{ $v->companyname_ }}">{{ $v->companyname_ }}</a>
-                                            </div>
-                                            <div class="clear"></div>
-                                        </div>
-                                    </div>
-                                </div>
-                            @endforeach
-                            <div class="clear"></div>
-                        @endif
-
-
-                        <div class="clear"></div>
-                    </div>
-                    <div class="clear"></div>
-                </div>
-
-                <div class="jobs_group tab-box5" style="display:none;">
-                    <div class="J_change_result">
-                        <div class="top_ad">
-                            @if($ads && array_key_exists('index_famous5',$ads))
-                                <ul>
-                                    @foreach($ads['index_famous5'] as $k=>$v)
-                                        <li class="ad_item">
-                                            <a href="{{ $v->href }}" target="_blank" title="{{ $v->title }}">
-                                                <img src="{{upload_asset($v->content)}}" border="0"/>
-                                            </a>
-
-                                        </li>
-                                    @endforeach
-                                </ul>
-                                <div class="clear"></div>
-                            @endif
-                        </div>
-
-                        @if(isset($seatmeal_companies[5]) && !empty($seatmeal_companies[5]))
-                            @foreach($seatmeal_companies[5] as $k=>$v)
-                                <div class="index_company_item comtip">
-                                    <div class="item-detail">
-                                        <div class="line-one">
-                                            <span class="salary">{{$v->wage_cn}}</span>
-                                            <div class="jobs_name substring">
-                                                <a target="_blank"
-                                                   href="{{$v->jobs_url}}">
-                                                    {{$v->jobs_name}}
-                                                </a>
-                                            </div>
-                                            <div class="clear"></div>
-                                            <div class="job_info substring">{{$v->district_cn}}
-                                                &nbsp;|&nbsp;{{$v->experience_cn}}
-                                                &nbsp;|&nbsp;{{$v->education_cn}}</div>
-                                        </div>
-                                        <div class="line-two">
-                                            <div class="company_logo  index_shadow_box">
-                                                <img src="{{ $v->logo }}" border="0"/>
-                                            </div>
-                                            <div class="company_name  substring"><a href="{{ $v->url }}" target="_blank"
-                                                                                    title="{{ $v->companyname_ }}">{{ $v->companyname_ }}</a>
-                                            </div>
-                                            <div class="clear"></div>
-                                        </div>
-                                    </div>
-                                </div>
-                            @endforeach
-                            <div class="clear"></div>
-                        @endif
-                    </div>
-                    <div class="clear"></div>
-                </div>
-                <div class="jobs_group tab-box6" style="display:none;">
-                    <div class="J_change_result">
-                        <div class="top_ad">
-                            @if($ads && array_key_exists('index_famous6',$ads))
-                                <ul>
-                                    @foreach($ads['index_famous6'] as $k=>$v)
-                                        <li class="ad_item">
-                                            <a href="{{ $v->href }}" target="_blank" title="{{ $v->title }}">
-                                                <img src="{{upload_asset($v->content)}}" border="0"/>
-                                            </a>
-                                        </li>
-                                    @endforeach
-                                </ul>
-                                <div class="clear"></div>
-                            @endif
-                        </div>
 
-                        @if(isset($seatmeal_companies[6]) && !empty($seatmeal_companies[6]))
-                            @foreach($seatmeal_companies[6] as $k=>$v)
-                                <div class="index_company_item comtip">
-                                    <div class="item-detail">
-                                        <div class="line-one">
-                                            <span class="salary">{{$v->wage_cn}}</span>
-                                            <div class="jobs_name substring">
-                                                <a target="_blank"
-                                                   href="{{$v->jobs_url}}">
-                                                    {{$v->jobs_name}}
-                                                </a>
-                                            </div>
-                                            <div class="clear"></div>
-                                            <div class="job_info substring">{{$v->district_cn}}
-                                                &nbsp;|&nbsp;{{$v->experience_cn}}
-                                                &nbsp;|&nbsp;{{$v->education_cn}}</div>
-                                        </div>
-                                        <div class="line-two">
-                                            <div class="company_logo  index_shadow_box">
-                                                <img src="{{ $v->logo }}" border="0"/>
-                                            </div>
-                                            <div class="company_name  substring"><a href="{{ $v->url }}" target="_blank"
-                                                                                    title="{{ $v->companyname_ }}">{{ $v->companyname_ }}</a>
-                                            </div>
-                                            <div class="clear"></div>
-                                        </div>
-                                    </div>
-                                </div>
-                            @endforeach
-                            <div class="clear"></div>
-                        @endif
-                    </div>
-                    <div class="clear"></div>
-                </div>
-                <div class="jobs_group tab-box7" style="display:none;">
-                    <div class="J_change_result">
-                        <div class="top_ad">
-                            @if($ads && array_key_exists('index_famous7',$ads))
-                                <ul>
-                                    @foreach($ads['index_famous7'] as $k=>$v)
-                                        <li class="ad_item">
-                                            <a href="{{ $v->href }}" target="_blank" title="{{ $v->title }}">
-                                                <img src="{{upload_asset($v->content)}}" border="0"/>
-                                            </a>
-                                        </li>
-                                    @endforeach
-                                </ul>
-                                <div class="clear"></div>
-                            @endif
-                        </div>
-
-                        @if(isset($seatmeal_companies[7]) && !empty($seatmeal_companies[7]))
-                            @foreach($seatmeal_companies[7] as $k=>$v)
-                                <div class="index_company_item comtip">
-                                    <div class="item-detail">
-                                        <div class="line-one">
-                                            <span class="salary">{{$v->wage_cn}}</span>
-                                            <div class="jobs_name substring">
-                                                <a target="_blank"
-                                                   href="{{$v->jobs_url}}">
-                                                    {{$v->jobs_name}}
-                                                </a>
-                                            </div>
-                                            <div class="clear"></div>
-                                            <div class="job_info substring">{{$v->district_cn}}
-                                                &nbsp;|&nbsp;{{$v->experience_cn}}
-                                                &nbsp;|&nbsp;{{$v->education_cn}}</div>
-                                        </div>
-                                        <div class="line-two">
-                                            <div class="company_logo  index_shadow_box">
-                                                <img src="{{ $v->logo }}" border="0"/>
-                                            </div>
-                                            <div class="company_name  substring"><a href="{{ $v->url }}" target="_blank"
-                                                                                    title="{{ $v->companyname_ }}">{{ $v->companyname_ }}</a>
-                                            </div>
-                                            <div class="clear"></div>
-                                        </div>
-                                    </div>
-                                </div>
-                            @endforeach
-                            <div class="clear"></div>
-                        @endif
-                    </div>
-                    <div class="clear"></div>
-                </div>
-            </div>
-        </div>
-    </div>
 
     <!--人才风采-->
     <div class="home_personal_appearance">

public/themes/default/views/app/recruit/show.blade.php

@@ -217,6 +217,17 @@
             })
         }
 
+        function isIE() {
+            var u = window.navigator.userAgent.toLocaleLowerCase(),
+                ie11 = /(trident)\/([\d.]+)/,
+                b = u.match(ie11);
+            if(b || !!window.ActiveXObject || "ActiveXObject" in window){
+                return true;
+            }else{
+                return false;
+            }
+        }
+
         $(function () {
 
             //右侧悬浮
@@ -254,10 +265,15 @@
                         disapperTooltip("remind", "只有登录个人会员才可报名！");
                         return false;
                     } else {
+                        if(isIE()){
+                            disapperTooltip("remind", "报名系统不支持IE浏览器，请更换浏览器！");
+                            return false;
+                        }
                         check_user_basic_info(id)
                         //window.location.href = "{{route('recruit.sign_up')}}" + '?id=' + id;
                     }
                 } else {
+
                     var qsDialog = $(this).dialog({
                         loading: true,
                         footer: false,
@@ -281,8 +297,8 @@
                             disapperTooltip('remind','操作失败');
                         }
                     });
-
                 }
+
             })
 
             //笔试准考证

public/themes/default/views/app/recruit/sign_up.blade.php

@@ -1222,13 +1222,14 @@
                 },
                 methods: {
                     //验证证件
-                    validID(rule, value, callback){
+                    validID: function(rule, value, callback){
                         if(!this.checkIDCard(value)) {
                             callback(new Error('身份证号不正确'));
+                        }else{
+                            callback();
                         }
-                        callback();
                     },
-                    checkIDCard(cardNo){
+                    checkIDCard:function(cardNo){
                         var weight_factor = [7,9,10,5,8,4,2,1,6,3,7,9,10,5,8,4,2];
                         var check_code = ['1', '0', 'X' , '9', '8', '7', '6', '5', '4', '3', '2'];
                         var code = cardNo + "";
@@ -1247,52 +1248,52 @@
                         return last === last_no && format ? true : false;
                     },
                     //验证手机号码
-                    validMobile(rule, value, callback){
+                    validMobile:function(rule, value, callback){
                         if(!(/^1[3456789]\d{9}$/.test(value))){
                             callback(new Error('手机号码不正确'));
                         }
                         callback();
                     },
                     //验证邮箱
-                    validEmail(rule, value, callback){
+                    validEmail:function(rule, value, callback){
                         if(!(/^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/.test(value))){
                             callback(new Error('电子邮箱不正确'));
                         }
                         callback();
                     },
                     //验证头像
-                    validAvatar(rule, value, callback){
+                    validAvatar:function(rule, value, callback){
                         callback();
                     },
-                    validSpecialCondition(rule, value, callback){
+                    validSpecialCondition:function(rule, value, callback){
                         if(this.user.special.point_apply == 1 && this.user.special.condition == ''){
                             callback(new Error('请输入符合加分的条件'));
                         }else{
                             callback();
                         }
                     },
-                    validSpecialMaterial(rule, value, callback){
+                    validSpecialMaterial:function(rule, value, callback){
                         if(this.user.special.point_apply == 1 && this.user.special.material.length == 0){
                             callback(new Error('请上传佐证材料'));
                         }else{
                             callback();
                         }
                     },
-                    validIdentification(rule, value, callback){
+                    validIdentification:function(rule, value, callback){
                         if(this.user.identification.length == 0){
                             callback(new Error('请上传身份证明证件'));
                         }else{
                             callback();
                         }
                     },
-                    validEducertification(rule, value, callback){
+                    validEducertification:function(rule, value, callback){
                         if(this.user.education_certification.length == 0){
                             callback(new Error('请上传学历证明证件'));
                         }else{
                             callback();
                         }
                     },
-                    beforeImageUpload(file) {
+                    beforeImageUpload:function(file) {
                         const isJPG = (file.type === 'image/jpeg' || file.type === 'image/png');
                         const isLt2M = file.size / 1024 / 1024 < 2;
 
@@ -1304,7 +1305,7 @@
                         }
                         return isJPG && isLt2M;
                     },
-                    uploadSuccess(response, file, fileList){
+                    uploadSuccess:function(response, file, fileList){
                         console.log(this.user)
                         if(response.status){
                             this.user.avatar = response.path;
@@ -1312,54 +1313,54 @@
                             this.$message.error(response.msg);
                         }
                     },
-                    uploadSuccessLP(response, file, fileList){
+                    uploadSuccessLP:function(response, file, fileList){
                         if(response.status){
                             this.user.special.material = fileList
                         }else{
                             this.$message.error(response.msg);
                         }
                     },
-                    uploadSuccessID(response, file, fileList){
+                    uploadSuccessID:function(response, file, fileList){
                         if(response.status){
                             this.user.identification = fileList
                         }else{
                             this.$message.error(response.msg);
                         }
                     },
-                    uploadSuccessEDU(response, file, fileList){
+                    uploadSuccessEDU:function(response, file, fileList){
                         if(response.status){
                             this.user.education_certification = fileList
                         }else{
                             this.$message.error(response.msg);
                         }
                     },
-                    uploadSuccessOther(response, file, fileList){
+                    uploadSuccessOther:function(response, file, fileList){
                         if(response.status){
                             this.user.other_certification = fileList
                         }else{
                             this.$message.error(response.msg);
                         }
                     },
-                    removeID(file,fileList) {
+                    removeID:function(file,fileList) {
                         this.user.identification = fileList
                     },
-                    removeLP(file,fileList) {
+                    removeLP:function(file,fileList) {
                         this.user.special.material = fileList
                     },
-                    removeEDU(file,fileList) {
+                    removeEDU:function(file,fileList) {
                         this.user.education_certification = fileList
                     },
-                    removeOther(file,fileList) {
+                    removeOther:function(file,fileList) {
                         this.user.other_certification = fileList
                     },
-                    handlePictureCardPreview(file){
+                    handlePictureCardPreview:function(file){
                         this.dialogImageUrl = file.url;
                         this.dialogVisible = true;
                     },
-                    postChange(value){
+                    postChange:function(value){
                         this.post_limit_value = this.post_limit[value];
                     },
-                    save(formName){
+                    save:function(formName){
                         this.user.operation = 1;
                         this.$refs[formName].validate((valid,object) => {
                             if (valid) {
@@ -1396,7 +1397,7 @@
                             }
                         })
                     },
-                    submit(formName){
+                    submit:function(formName){
                         this.user.operation = 2;
                         this.$refs[formName].validate((valid,object) => {
                             if (valid) {
@@ -1523,7 +1524,7 @@
                             }
                         })
                     },
-                    addFamily(){
+                    addFamily:function(){
                         this.user.family.push({
                             appellation:'',
                             realname:'',
@@ -1532,7 +1533,7 @@
                             work:''
                         });
                     },
-                    delFamily(){
+                    delFamily:function(){
                         var length = this.user.family.length;
                         if (length > 1) {
                             this.user.family.pop()
@@ -1734,8 +1735,9 @@
                 validID(rule, value, callback){
                     if(!this.checkIDCard(value)) {
                         callback(new Error('身份证号不正确'));
+                    }else{
+                        callback();
                     }
-                    callback();
                 },
                 checkIDCard(cardNo){
                     var weight_factor = [7,9,10,5,8,4,2,1,6,3,7,9,10,5,8,4,2];

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

@@ -270,7 +270,11 @@
                 @if(array_has($articles1, '3') && $articles1['3'])
                     @foreach($articles1['3'] as $k=>$v)
                         <li>
-                            <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>
+                            @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>
+                            @else
+                                <a href="{{$v->is_url}}" 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>
+                            @endif
                         </li>
                     @endforeach
                         <div onclick="window.location='{{route($sub_site."mobile.news.list",['id'=>3])}}';" style="text-align:center;height:.8rem;line-height:.8rem;background:#fff;">查看更多</div>

resources/views/admin/recruit/appoint_list.blade.php

@@ -528,6 +528,7 @@
                     $.post("{{ route('recruit.fetchword') }}", {_token:'{{ csrf_token() }}',recruit_id:recruit_id,appoint_id:appoint_id}, function(result) {
                         if (result.status == 1) {
                             disapperTooltip('success', result.msg);
+                            window.location.href = result.url;
                             setTimeout(function() {
                                 $.pjax.reload('#pjax-container');
                                 qsDialog.hide(true);

resources/views/admin/recruit/manageajax_userinfo.blade.php

@@ -759,6 +759,16 @@
             </td>
         </tr>
     @endif
+    @if(in_array('remark',$recruit->forms))
+        <tr style="height:52px;page-break-inside:avoid">
+            <td valign="center">
+                备注
+            </td>
+            <td valign="center" colspan="11">
+                {{ $appointinfo->remark }}
+            </td>
+        </tr>
+    @endif
     </tbody>
 </table>
 @endif