Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/Admin/Controllers/Recruit/RecruitController.php

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

@@ -1439,10 +1439,10 @@ class IndexController extends WebBaseController
                     ];
                     RecruitAppointLog::create($log);
                     if(empty($recruit->qr_code)){
-                        return ['status' => 1, 'msg' => '提交成功', 'data' => $appoint_info->id, 'is_html' => 0];
+                        return ['status' => 1, 'msg' => '提交成功', 'data' => $result->id, 'is_html' => 0];
 
                     }else{
-                        return ['status' => 1, 'msg' => "<h3 style='text-align: center'>提交成功，添加工作人员企业微信了解后续信息</h3><p><img src='/storage/{$recruit->qr_code}' width='240' height='240' /></p>", 'data' => $appoint_info->id,'is_html' => 1];
+                        return ['status' => 1, 'msg' => "<h3 style='text-align: center'>提交成功，添加工作人员企业微信了解后续信息</h3><p><img src='/storage/{$recruit->qr_code}' width='240' height='240' /></p>", 'data' => $result->id,'is_html' => 1];
 
                     }
                     //return ['status' => 1, 'msg' => '提交成功', 'data' => $result->id];

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

@@ -1632,6 +1632,7 @@
 
                                     axios.post("{{route('recruit.save_sign_up')}}",Qs.stringify(this.user)).then(response => {
                                         if(response.data.status){
+                                            console.log(response.data.is_html == 1)
                                             if(response.data.is_html == 1){
                                                 this.$alert(response.data.msg, '提交成功', {
                                                     dangerouslyUseHTMLString: true,