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

app/Admin/Controllers/Recruit/RecruitController.php

@@ -894,9 +894,16 @@ class RecruitController extends Controller
         Permission::check('recruit_ajax_supplement');
         $ids = $request->ids;
         $view_data['ids'] = $ids;
-        $info = RecruitSupplement::where('appoint_id',$ids)->first();
+        $info = RecruitSupplement::where('appoint_id',$ids)->where('type','supplement')->first();
         if(!$info){
             $view_data['switch'] = 0;
+            $view_data['photos'] = [
+                'identification'=>[],
+                'household_register' => [],
+                'education_certification'=>[],
+                'family_planning'=>[],
+                'manage' => []
+            ];
         }else{
             $view_data['switch'] = 1;
             $photos = [
@@ -908,13 +915,15 @@ class RecruitController extends Controller
             ];
             $info->identification = json_decode($info->identification);
             $photo_data = [];
-            foreach ($info->identification as $k => $v) {
-                if($v->status){
-                    $photo_data[] = [
-                        'alt' => $v->name,
-                        'pid' => $v->uid,
-                        'src' => $v->response->path,
-                    ];
+            if(is_array($info->identification)){
+                foreach ($info->identification as $k => $v) {
+                    if($v->status){
+                        $photo_data[] = [
+                            'alt' => $v->name,
+                            'pid' => $v->uid,
+                            'src' => $v->response->path,
+                        ];
+                    }
                 }
             }
             $photos['identification'] = [
@@ -925,13 +934,15 @@ class RecruitController extends Controller
             ];
             $info->household_register = json_decode($info->household_register);
             $photo_data = [];
-            foreach ($info->household_register as $k => $v) {
-                if($v->status){
-                    $photo_data[] = [
-                        'alt' => $v->name,
-                        'pid' => $v->uid,
-                        'src' => $v->response->path,
-                    ];
+            if(is_array($info->household_register)){
+                foreach ($info->household_register as $k => $v) {
+                    if($v->status){
+                        $photo_data[] = [
+                            'alt' => $v->name,
+                            'pid' => $v->uid,
+                            'src' => $v->response->path,
+                        ];
+                    }
                 }
             }
             $photos['household_register'] = [
@@ -942,13 +953,15 @@ class RecruitController extends Controller
             ];
             $info->education_certification = json_decode($info->education_certification);
             $photo_data = [];
-            foreach ($info->education_certification as $k => $v) {
-                if($v->status){
-                    $photo_data[] = [
-                        'alt' => $v->name,
-                        'pid' => $v->uid,
-                        'src' => $v->response->path,
-                    ];
+            if(is_array($info->education_certification)){
+                foreach ($info->education_certification as $k => $v) {
+                    if($v->status){
+                        $photo_data[] = [
+                            'alt' => $v->name,
+                            'pid' => $v->uid,
+                            'src' => $v->response->path,
+                        ];
+                    }
                 }
             }
             $photos['education_certification'] = [
@@ -976,15 +989,18 @@ class RecruitController extends Controller
 //            ];
             $info->manage = json_decode($info->manage);
             $photo_data = [];
-            foreach ($info->manage as $k => $v) {
-                if($v->status){
-                    $photo_data[] = [
-                        'alt' => $v->name,
-                        'pid' => $v->uid,
-                        'src' => $v->response->path,
-                    ];
+            if(is_array($info->manage)){
+                foreach ($info->manage as $k => $v) {
+                    if($v->status){
+                        $photo_data[] = [
+                            'alt' => $v->name,
+                            'pid' => $v->uid,
+                            'src' => $v->response->path,
+                        ];
+                    }
                 }
             }
+
             $photos['manage'] = [
                 'title' => '综治证明',
                 'id' => 1,
@@ -1288,7 +1304,7 @@ class RecruitController extends Controller
             return response()->json(['status' => 0, 'msg' => '请输入审核原因！'], '200');
         }
         if($status == -1){
-            $info = RecruitSupplement::where('appoint_id', $ids)->first();
+            $info = RecruitSupplement::where('appoint_id', $ids)->where('type','supplement')->first();
             $appointinfo = RecruitAppointInfo::where('id', $ids)->first();
             //写日志
             $log = [
@@ -1308,7 +1324,7 @@ class RecruitController extends Controller
         }
         if($status == 1){
             $reason = $reason ?? '符合报考条件';
-            $info = RecruitSupplement::where('appoint_id', $ids)->first();
+            $info = RecruitSupplement::where('appoint_id', $ids)->where('type','supplement')->first();
             $appointinfo = RecruitAppointInfo::where('id', $ids)->first();
             //写日志
             $log = [
@@ -1976,6 +1992,7 @@ class RecruitController extends Controller
         $where = [];
         $where[] = ['audit','>',0];
         $where[] = ['recruit_appoint_info.recruit_id', '=', $data['id']];
+
         $param = parse_url($data['where']);
         parse_str($param['query'],$param);
         if (is_array($param)) {
@@ -1983,6 +2000,17 @@ class RecruitController extends Controller
             foreach ($param as $k => $v) {
                 if ($k == 'realname') {
                     $where[] = [$k, 'like', "%$v%"];
+                } elseif ($k == 'id') {
+                    $where[] = ['recruit_appoint_info.recruit_id', '=', $v];
+                } elseif($k == 'print_bs'){
+                    $where[] = ['recruit_ticket.ex_type', '=', 1];
+                    $where[] = ['recruit_ticket.ex_status', '=', $v];
+                } elseif($k == 'print_js'){
+                    $where[] = ['recruit_ticket.ex_type', '=', 2];
+                    $where[] = ['recruit_ticket.ex_status', '=', $v];
+                } elseif($k == 'print_ms'){
+                    $where[] = ['recruit_ticket.ex_type', '=', 3];
+                    $where[] = ['recruit_ticket.ex_status', '=', $v];
                 } elseif ($k != '_pjax' and $k != 'page' && $k != 'perpage') {
                     $where[] = [$k, '=', $v];
                 }

app/Http/Controllers/Web/Person/MemberInfoController.php

@@ -12,6 +12,7 @@ use App\Services\Person\MemberService;
 use App\Services\Person\ResumeService;
 use App\Validators\PersonValidatorRequest;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 
 class MemberInfoController extends WebBaseController
 {
@@ -189,6 +190,15 @@ class MemberInfoController extends WebBaseController
         if (!$this->MemberService->findByEmail($id, $email)->isEmpty()) {
             return $this->sendErrorResponse('该邮箱已经认证!', '', 400);
         }
+        $redis = Cache::getRedis();
+        $value = $redis->get('user_email_'.$request->account);
+        if(!$value){
+            $value = 0;
+        }
+        if($value >= 5){
+            $redis->expire('user_email_'.$request->account,900);
+            return $this->sendErrorResponse("连续登录失败5次，请15分钟后再尝试！");
+        }
         $this->emailService->setAuthTag('personal')
             ->setCallback('App\Services\Person\MemberInfoService', 'sendAuthEmailHook', [$email, auth('web-member')->user()])
             ->sendAuthMail($email, EmailService::TEMPLATE_VALIDATION);

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

@@ -1441,115 +1441,14 @@ class IndexController extends WebBaseController
             return $this->showMessage('抱歉，您未入闱，无需考察审核！', route('recruit.show',array('id',$recruit['id'])), true, '上一页', '3');
         }
 
-        $uids = array (
-            0 => '175624',
-            1 => '175637',
-            2 => '173543',
-            3 => '175663',
-            4 => '175628',
-            5 => '159629',
-            6 => '170066',
-            7 => '175826',
-            8 => '175629',
-            9 => '175620',
-            10 => '175738',
-            11 => '175854',
-            12 => '164974',
-            13 => '167931',
-            14 => '175757',
-            15 => '175951',
-            16 => '175893',
-            17 => '175995',
-            18 => '176024',
-            19 => '176044',
-            20 => '169828',
-            21 => '152230',
-            22 => '176147',
-            23 => '176144',
-            24 => '176189',
-            25 => '169518',
-            26 => '175925',
-            27 => '176327',
-            28 => '176347',
-            29 => '176349',
-            30 => '176407',
-            31 => '170378',
-            32 => '176463',
-            33 => '176457',
-            34 => '169219',
-            35 => '169285',
-            36 => '163039',
-            37 => '176545',
-            38 => '176551',
-            39 => '169814',
-            40 => '175847',
-            41 => '175755',
-            42 => '169240',
-            43 => '176669',
-            44 => '176605',
-            45 => '176807',
-            46 => '169917',
-            47 => '176888',
-            48 => '176578',
-            49 => '176681',
-            50 => '148287',
-            51 => '176511',
-            52 => '176946',
-            53 => '176922',
-            54 => '176955',
-            55 => '167385',
-            56 => '176971',
-            57 => '176969',
-            58 => '176984',
-            59 => '169932',
-            60 => '176250',
-            61 => '149243',
-            62 => '177026',
-            63 => '169607',
-            64 => '150162',
-            65 => '177055',
-            66 => '177061',
-            67 => '177056',
-            68 => '169761',
-            69 => '177096',
-            70 => '177118',
-            71 => '177102',
-            72 => '159073',
-            73 => '177119',
-            74 => '169641',
-            75 => '177158',
-            76 => '177128',
-            77 => '170175',
-            78 => '170822',
-            79 => '177193',
-            80 => '177234',
-            81 => '177251',
-            82 => '168964',
-            83 => '176034',
-            84 => '150532',
-            85 => '168487',
-            86 => '177304',
-            87 => '170441',
-            88 => '177262',
-            89 => '177342',
-            90 => '177356',
-            91 => '170376',
-            92 => '177316',
-            93 => '177361',
-            94 => '177170',
-            95 => '171720',
-            96 => '176736',
-        );
-        $limit_time = 1654078200;
-        if(in_array($uid,$uids)){
-            $limit_time = 1654164000;
-        }
+
+        $limit_time = 1660210200;
         $time = time();
         if( $time > $limit_time){
             return $this->showMessage('抱歉，考察审核端口已关闭！', route('recruit.show',array('id',$recruit['id'])), true, '上一页', '3');
         }
 
-        $info = RecruitSupplement::where('appoint_id',$appoint_info->id)->first();
+        $info = RecruitSupplement::where('appoint_id',$appoint_info->id)->where('type','supplement')->first();
         if(!$info){
             $info = [
                 'appoint_id' => $appoint_info->id,
@@ -1742,12 +1641,18 @@ class IndexController extends WebBaseController
         } else {
             return redirect(route('login'));
         }
+        $limit_time = 1660210200;
+        $time = time();
+        if( $time > $limit_time){
+            return $this->showMessage('抱歉，考察审核端口已关闭！', route('recruit.show',array('id',18)), true, '上一页', '3');
+        }
+
         $appoint_id = $request->input('appoint_id');
-        $appoint_info = RecruitAppointInfo::where('uid',$uid)->where('recruit_id',16)->where('id',$appoint_id)->first();
+        $appoint_info = RecruitAppointInfo::where('uid',$uid)->where('recruit_id',18)->where('id',$appoint_id)->first();
         if(!$appoint_info){
             return ['status' => 0, 'msg' => '抱歉，找不到您要补登的报名记录！'];
         }
-        $info = RecruitSupplement::where('appoint_id',$appoint_id)->first();
+        $info = RecruitSupplement::where('appoint_id',$appoint_id)->where('type','supplement')->first();
         if($info){
             if($info->status == 1){
                 return ['status' => 0, 'msg' => '材料已审核通过，不允许修改'];
@@ -1873,6 +1778,7 @@ class IndexController extends WebBaseController
             }
             $data['manage'] = json_encode($manage);
             $data['status'] = 0;
+            $data['type'] = 'supplement';
             $result = RecruitSupplement::create($data);
             $appoint_info->political_audit = 4;
             $appoint_info->save();
@@ -1893,10 +1799,10 @@ class IndexController extends WebBaseController
         $appoint_id = $request->input('appoint_id');
         $type = $request->input('type');
         $appoint_info = RecruitAppointInfo::where('uid',$uid)->where('id',$appoint_id)->first();
-        $recruit = Recruit::where('id',$appoint_info->recruit_id)->first();
         if(!$appoint_info){
             return ['status' => 0, 'msg' => '抱歉，找不到您要登记的报名记录！'];
         }
+        $recruit = Recruit::where('id',$appoint_info->recruit_id)->first();
         $info = RecruitSupplement::where('appoint_id',$appoint_id)->where('type',$type)->first();
         if($info){
             if($info->h_status == 1){
@@ -1948,8 +1854,9 @@ class IndexController extends WebBaseController
             }
 
             $health_result = $this->baiduService->health_code(file_get_contents(base_path() . "/public" . $health_code[0]['response']['path']));
-            $health_msg = [];
+            $health_msg = ['健康码自动审核通过'];
             $h_status = 1;
+            $appoint_info->health_audit = 1;
             if(!array_key_exists('error_msg',$health_result) && !array_key_exists('error_code',$health_result)){
                 if(array_key_exists('姓名',$health_result)){
                     if(stripos($health_result['姓名'][0]['word'],'*')>0){
@@ -1957,38 +1864,29 @@ class IndexController extends WebBaseController
                     }
                     if($health_result['姓名'][0]['word'] != $appoint_info->realname){
                         array_push($health_msg,'抱歉，请上传您本人的健康码！');
-                        $h_status = 0;
                     }
                 }else{
                     array_push($health_msg,'健康码错误，识别不到姓名！');
-                    $h_status = 0;
                 }
                 if(array_key_exists('状态',$health_result)){
                     if($health_result['状态'][0]['word'] != '绿码'){
                         array_push($health_msg,'抱歉，您的健康码非绿码！');
-                        $h_status = 0;
                     }
                 }else{
                     array_push($health_msg,'健康码错误，识别不到状态！');
-                    $h_status = 0;
                 }
                 if(array_key_exists('更新时间',$health_result)){
                     $time = strtotime($health_result['更新时间'][0]['word']);
                     if($time < strtotime($recruit->pen_health_start) || $time > strtotime($recruit->pen_health_end)){
                         array_push($health_msg,'抱歉，请上传{$recruit->pen_health_start}至{$recruit->pen_health_end}之间的健康码！');
-                        $h_status = 0;
                     }
                 }else{
                     array_push($health_msg,'健康码错误，识别不到时间！');
-                    $h_status = 0;
                 }
                 $data['h_status'] = $h_status;
-                $data['h_msg'] = $h_status == 1 ? '健康码自动审核通过' : implode(';',$health_msg);
+                $data['h_msg'] = implode(';',$health_msg);
                 $appoint_info->health_audit = $h_status == 1 ? 1 : 4;
                 $data['health_code'] = json_encode($health_code);
-            }else{
-                $data['h_status'] = 0;
-                $appoint_info->health_audit = $h_status == 4;
             }
 
             $data['health_result'] = json_encode($health_result);
@@ -2025,7 +1923,7 @@ class IndexController extends WebBaseController
                         $trip_status = 0;
                     }
                 }
-                $data['h_msg'] = implode(';',$trip_msg);
+                $data['h_msg'] .= implode(';',$trip_msg);
             }
 
             $data['trip_result'] = json_encode($trip_result);
@@ -2233,6 +2131,12 @@ class IndexController extends WebBaseController
         return ['status' => 1, 'msg' => "提交择岗意愿成功，请耐心等待结果！"];
     }
 
+    public function select_result(Request $request)
+    {
+        $view_data = [];
+        return view('app.recruit.select_result',$view_data);
+    }
+
 
     public function interviewer_random(Request $request)
     {
@@ -2287,4 +2191,6 @@ class IndexController extends WebBaseController
         return view('app.recruit.interviewer', $return_data);
     }
 
+
+
 }

app/Http/Controllers/Web/Talent/JjhcController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Web\Talent;
 
 use App\Http\Controllers\Web\WebBaseController;
+use App\Models\RecruitAppointSelect;
 use App\Models\RecruitPost;
 use App\Services\Common\SmsService;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -49,9 +50,38 @@ class JjhcController extends WebBaseController
         if($keyword != "j0vOW5mBREZxdo3P"){
             throw new ResponseException("who are you?", [], 404);
         }
-        $baidu = new BaiduService();
-        $health_result = $baidu->health_code(file_get_contents(base_path() . "/public/test.jpg" ));
-        dd($health_result);
+        $option_list = [
+            '青阳街道','梅岭街道','西园街道','罗山街道','灵源街道','新塘街道','陈埭镇','池店镇','安海镇','磁灶镇','内坑镇','紫帽镇','东石镇','永和镇','英林镇','金井镇','龙湖镇','深沪镇','西滨镇'
+        ];
+        for ($i = 1;$i<=1000;$i++){
+            $uid = rand(0,999999);
+            $recruit_id = 8;
+            $appoint_id = rand(0,999999);
+            $info = RecruitAppointSelect::where('uid',$uid)->where('recruit_id',$recruit_id)->where('appoint_id',$appoint_id)->first();
+            if($info){
+                return ['status' => 0, 'msg' => "测试数据重复，请重新点击生成测试数据！"];
+            }
+            $data = [
+                'recruit_id' => $recruit_id,
+                'appoint_id' => $recruit_id,
+                'uid' => $uid,
+                'status' => 1
+            ];
+            shuffle($option_list);
+            $select = array_slice($option_list,0,rand(1,19));
+            $result = [];
+            if(is_array($select) && count($select) > 0){
+                foreach ($select as $v) {
+                    array_push($result,$v);
+                }
+            }
+            $data['result'] = json_encode($result);
+            RecruitAppointSelect::create($data);
+
+        }
+
+
+
 
 //        for ($room = 1;$room <= 78; $room++){
 //            $list = DB::table("recruit_ticket")->leftJoin("recruit_appoint_info","recruit_ticket.appoint_id",'=','recruit_appoint_info.id')->where("recruit_ticket.ex_start",'2022-08-05 08:00:00')->where('recruit_ticket.ex_room',$room)->orderBy('ex_seat','ASC')->get()->toArray();

app/Services/Auth/AuthService.php

@@ -74,9 +74,9 @@ class AuthService
         if (!$user) {
             return false;
         }
-        if(!$this->checkPwdLog($user)){
-            return false;
-        }
+//        if(!$this->checkPwdLog($user)){
+//            return false;
+//        }
         $this->login($user, $isAutoLogin);
 
         //绑定微信和中奖

public/test.html

@@ -1,216 +1,13 @@
-
-<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html lang="en">
 <head>
-    <meta charset="utf-8">
-    <meta name="author" content="m.jd.com">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta content="yes" name="apple-mobile-web-app-capable"/>
-    <meta content="yes" name="apple-touch-fullscreen"/>
-    <meta content="telephone=no" name="format-detection"/>
-    <meta content="black" name="apple-mobile-web-app-status-bar-style">
-    <meta content="#ffffff" name="msapplication-TileColor"/>
-    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport"/>
-    <link rel="stylesheet" href="https://oilcard.m.jd.com//skin/jd-mater.css"/>
-    <link rel="stylesheet" href="https://oilcard.m.jd.com//skin/fuelcard.css"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <title>订单详情</title>
-    <meta name="format-detection" content="telephone=no"/>
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <link href="https://oilcard.m.jd.com//js/jquery.toast/jquery.toast.min.css" rel="stylesheet" type="text/css"/>
-    <link href="https://oilcard.m.jd.com//css/animate.css" rel="stylesheet" type="text/css"/>
-    <link rel="stylesheet" type="text/css" href="//st.360buyimg.com/common/commonH_B/css/header.css" charset="utf-8"/>
-    <link rel="stylesheet" type="text/css" href="https://oilcard.m.jd.com//css/mobileSelect.css">
-
-    <script type="text/javascript" src="https://oilcard.m.jd.com//js/jquery-1.11.1.min.js"></script>
-    <script type="text/javascript" src="https://oilcard.m.jd.com//js/jquery.tap.min.js"></script>
-    <script type="text/javascript" src="https://oilcard.m.jd.com//js/alert.js"></script>
-
-
-    <script type="text/javascript" src="https://oilcard.m.jd.com//js/jquery.toast/jquery.toast.min.js"></script>
-    <script type="text/javascript" src="https://oilcard.m.jd.com//js/full_js/common.js?v=20160219"></script>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Document</title>
 </head>
-
-<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
-<!--<script type="text/javascript" src="https://wq.360buyimg.com/js/common/dest/wq.jshop.report.min.js"/>-->
-
-<link rel="stylesheet" type="text/css" href="https://oilcard.m.jd.com//skin/wq-nav.css"/>
-<div class="wraper">
-    <div class="nav-tab">
-        <div class="nav-box">
-            <b class="pic"></b>
-            <span class="nav_text">快捷导航</span>
-        </div>
-        <div class="nav-list">
-            <a class="nav-li" id="wqIndex">
-                <b class="icon icon_index"></b>
-                <span class="text">首页</span>
-            </a>
-            <a class="nav-li" id="wqSearch">
-                <b class="icon icon_search"></b>
-                <span class="text">搜索</span>
-            </a>
-            <a class="nav-li" id="wqMyCenter">
-                <b class="icon icon_people"></b>
-                <span class="text">个人中心</span>
-            </a>
-            <a href="https://wqs.jd.com/search/searchfootprint.shtml?ptag=7105.12.7" class="nav-li">
-                <b class="icon icon_history"></b>
-                <span class="text">足迹</span>
-            </a>
-            <a href="https://wqs.jd.com/customer/feedback.shtml?fromurl=https://wqs.jd.com/my/accountv2.shtml&ptag=7155.1.73"
-               class="nav-li">
-                <b class="icon icon_back"></b>
-                <span class="text">用户反馈</span>
-            </a>
-            <a class="nav-li" id="wqCart">
-                <b class="icon icon_purchase"></b>
-                <span class="text">购物车</span>
-            </a>
-        </div>
-    </div>
-
-</div>
-
-<script type="text/javascript">
-
-    $("#wqIndex").on("click", function () {
-        wx.miniProgram.switchTab({url: "/pages/index/index"});
-    });
-
-    $("#wqSearch").on("click", function () {
-        wx.miniProgram.switchTab({url: "/pages/cate/cate"});
-    });
-
-    $("#wqMyCenter").on("click", function () {
-        wx.miniProgram.switchTab({url: "/pages/my/index/index"});
-    });
-
-    $("#wqCart").on("click", function () {
-        wx.miniProgram.switchTab({url: "/pages/cart/cart/index"});
-    });
-
-</script>
-
-<script type="text/javascript">
-    $(function () {
-        $('.nav-box').click(function () {
-            $('.pic').toggleClass('right_pic');
-            var text = $('.nav_text').text();
-            if (text == '收起') {
-                $('.nav_text').text('快捷导航');
-                $('.nav-tab').removeClass('animate-left');
-                $('.nav-tab').addClass('animate-right');
-            } else {
-                $('.nav_text').text('收起');
-                $('.nav-tab').removeClass('animate-right');
-                $('.nav-tab').addClass('animate-left');
-            }
-        });
-
-        $('#wqIndex').click(function () {
-            //navigate
-        })
-    })
-</script>
-
-<script type="text/javascript">
-    $(function () {
-        //非小程序来源 或者 独立小程序
-        var cookie = getCookie('wxapp_type');
-        if (cookie != "1") {
-            $('.nav-tab').addClass("hidden");
-        }
-        //小程序来源
-        else {
-            $('.nav-tab').removeClass("hidden");
-            $.getScript("https://wq.360buyimg.com/js/common/dest/wq.jshop.report.min.js");
-//            document.writeln('<script type="text/javascript" src="https://wq.360buyimg.com/js/common/dest/wq.jshop.report.min.js"/>');
-        }
-    })
-
-    function getCookie(cname) {
-        var name = cname + "=";
-        var ca = document.cookie.split(';');
-        for (var i = 0; i < ca.length; i++) {
-            var c = ca[i].trim();
-            if (c.indexOf(name) == 0) return c.substring(name.length, c.length);
-        }
-        return "";
-    }
-</script>
 <body>
-<div id="m_common_header" style="min-height:45px"></div>
-
-<div class="common-wrapper order-detail">
-    <input type="hidden" id="orderId" value='211689464191'>
-    <input type="hidden" id="skuId" value='200108042928'>
-    <input type="hidden" id="totalPrice" value='100.00'>
-    <i class="ico-water"></i>
-    <div class="box box1">
-        <div class="title">
-            <span class="f-s-28 fl"><font class="c-68">订 单 号：</font><font class="c-23">211689464191</font></span>
-            <span class='fr red f-s-26'></span>
-        </div>
-        <p>
-                 <span class="f-s-28 toStore">
-                                             <a href="//pro.m.jd.com/mall/active/2JMzArjbUNBLVRK9GAYaaiiUruNb/index.html">中石油油卡充值旗舰店 &gt;</a>
-                                      </span>
-            <span class="f-s-28"><font class="c-68">加油卡号：</font><font class="c-23">****3530</font></span>
-            <span class="f-s-28"><font class="c-68">油卡信息：</font><font class="c-23">中国石油油卡充值 中石油个人记名卡充值 全国可充，支持开票100元</font></span>
-            <span class="f-s-28"><font class="c-68">充值金额：</font><font class="c-23">100.00元</font></span>
-        </p>
-
-        <p class="border-t nopb" id="">
-
-            <span class="f-s-24 c-84 txt">您可至中石油官网查询圈存站点信息。</span>
-        </p>
-    </div>
-    <div class="box box2">
-        <span class="f-s-28 c-23">支付方式</span><span class="f-s-28 c-23 fr">在线支付</span>
-    </div>
-    <div class="box box3">
-        <p><span class="f-s-28 c-23">商品金额</span><span class="f-s-28 red fr">￥<em
-                class="f-s-36">100.00</em></span></p>
-
-        <p class="txtr ptb pay-real"><span class="f-s-28 red"><em>实付款：</em>￥<em
-                class="f-s-36">100.00</em></span></p>
-        <p class="txtr"><span class="f-s-24 c-84">下单时间：2021-07-04 23:50:17</span></p>
-    </div>
-
-    <div class="open-dong">
-        <a href="http://chat.jd.com/chat/index.action?venderId=1&appId=jd.waiter&customerAppId=im.customer&entry=jd_m_gas">
-            <b class="dong-icon"></b>
-            <span>联系客服</span>
-        </a>
-    </div>
-
-
-    <p class='order-foot border-t'>
-    <div class="btn-fixed-wrapper">
-        <button id="continueToBuy" skuId="200108052204" brand="1" class="btn-payfor-footer">
-            再次购买
-        </button>
-    </div>
-    </p>
-</div>
-
-<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
-<script type="text/javascript" src="https://oilcard.m.jd.com//js/full_js/orderDetail.js"></script>
-<div id="m_common_bottom"></div>
-<script type="text/javascript" src="//wl.jd.com/unify.min.js"></script>
-<script type="text/javascript" src="https://oilcard.m.jd.com//js/full_js/bottom.js?v=20160219"></script>
-<script type="text/javascript" src="//st.360buyimg.com/common/commonH_B/js/m_common_header_bottom2.1.js"></script>
-<script type="text/javascript" src="//st.360buyimg.com/common/commonH_B/js/m_common2.1.js" ></script>
-<script type="text/javascript" src="//st.360buyimg.com/m/js/2014/module/plugIn/downloadAppPlugIn_imk2.js"></script>
-<script type="text/javascript">
-    $(function(){
-        var mchb = new MCommonHeaderBottom();
-        var headerArg = {hrederId : 'm_common_header',title: '订单详情' , sid : '', isShowShortCut : false, selectedShortCut : '4'};
-        mchb.header(headerArg);
 
-    });
-</script>
 </body>
-</html> 
+</html>

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

@@ -92,9 +92,9 @@
                         <li style="background:#EFC1B3;float: left;margin-bottom:10px;">健康信息登记</li>
                     </a>
                 @endif
-                @if($recruit->id == 16)
+                @if($recruit->id == 18)
                     <a href="{{ route('recruit.material_supplement',array('id'=>$recruit->id)) }}" >
-                        <li style="background:#EFC1B3;float: left;margin-bottom:10px;">考察审核</li>
+                        <li style="background:#67C23A;float: left;margin-bottom:10px;">考察审核</li>
                     </a>
                 @endif
                 <div style="clear: both;"></div>

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

@@ -396,7 +396,7 @@
                                                 @if($recruit->pen_health == 1)
                                                     <button class='btn btn-primary btn-xs health' data-param="{{$v->id}}" data-type="pen" style="margin-bottom: 10px">笔试健康信息审核</button>
                                                 @endif
-                                                @if($recruit->id == 5 || $recruit->id == 16)
+                                                @if($recruit->id == 5 || $recruit->id == 16 || $recruit->id == 18)
                                                     <button class='btn btn-primary btn-xs supplement' data-param="{{$v->id}}" style="margin-bottom: 10px">补登材料审核</button>
                                                 @endif
                                             </td>

routes/web.php

@@ -117,6 +117,7 @@ Route::group([
     $router->get('post_select','Web\Recruit\IndexController@post_select')->name('recruit.post_select');
     $router->post('give_up_post','Web\Recruit\IndexController@give_up_post')->name('recruit.give_up_post');
     $router->post('comfirm_post','Web\Recruit\IndexController@comfirm_post')->name('recruit.comfirm_post');
+    $router->get('select_result','Web\Recruit\IndexController@select_result')->name('recruit.select_result');
 
     $router->any('/{route?}', function () {
         return view('recruit');