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

app/Admin/Controllers/Recruit/RecruitController.php

@@ -1398,7 +1398,7 @@ class RecruitController extends Controller
             $this->smsService->sendSms($appointinfo->mobile,'sms_recruit_register_error',array('reason'=>$reason));
         }
         if($status == 1){
-            $reason = $reason ?? '符合报考条件';
+            $reason = $reason ?? '健康信息审核通过，请及时打印准考证';
             $info = RecruitSupplement::where('appoint_id', $ids)->where('type',$type)->first();
             $appointinfo = RecruitAppointInfo::where('id', $ids)->first();
             //写日志
@@ -1415,7 +1415,7 @@ class RecruitController extends Controller
             $info->save();
             $appointinfo->health_audit = 1;
             $appointinfo->save();
-            $this->smsService->sendSms($appointinfo->mobile,'sms_recruit_register_success',array('reason'=>"健康信息审核通过，请及时打印准考证"));
+            $this->smsService->sendSms($appointinfo->mobile,'sms_recruit_register_success',array('reason'=>$reason));
         }
 
 

app/Http/Controllers/Mobile/Jobfair/JobfairController.php

@@ -256,7 +256,7 @@ class JobfairController extends MobileBaseController
     {
         $jobfairList = $this->jobfairService->index($request);
         if ($request->ajax()) {
-            if ($jobfairList->isNotEmpty()) {
+            if ($jobfairList['allJobfair']->isNotEmpty()) {
                 return response()->json(['status'=>1,'data'=>view('mobile.app.jobfair.ajax.ajax_jobfair_list', ['jobfairList'=>$jobfairList])->render()]);
             }
             return response()->json(['status'=>0]);

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

@@ -1347,7 +1347,7 @@ class IndexController extends WebBaseController
                     $name = $recruit->name_en;
                     $date = date("Y-m-d",strtotime($recruit->created_at));
                     $filename = $date . '_' . $appoint_info->realname . '_' . $appoint_info->card . '_' . $post_data[$appoint_info->post_id];
-                    $file = base_path() . "/storage/app/public/recruit/ticket/word/{$date}/{$name}/face/" . $filename . '.docx';
+                    $file = base_path() . "/storage/app/public/recruit/ticket/pdf/{$date}/{$name}/face/" . $filename . '.pdf';
                     if(file_exists($file)){
                         header('Content-Description: File Transfer');
                         header('Content-Type: application/octet-stream');

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

@@ -681,7 +681,7 @@
                                             return false;
                                         }
                                         dialog_1.setCloseDialog(true);
-                                        window.location.href = "{!! route('recruit.pen_ticket',['recruit_id'=>$recruit->id,'uid'=>$uid]) !!}";
+                                        window.location.href = "{!! route('recruit.face_ticket',['recruit_id'=>$recruit->id,'uid'=>$uid]) !!}";
                                     }
                                 });
                                 dialog_1.setContent($('#commit1').html())