Merge remote-tracking branch 'origin/master'

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

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

@@ -1235,7 +1235,7 @@ class IndexController extends WebBaseController
                         return ['status' => 1, 'msg' => '提交成功', 'data' => $appoint_info->id, 'is_html' => 0];
 
                     }else{
-                        return ['status' => 1, 'msg' => "<h3 style='text-align: center'>提交成功，添加工作人员企业微信了解后续信息</h3><p><img src='{$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 style='text-align: center'><img src='{$recruit->qr_code}' width='240' height='240' /></p>", 'data' => $appoint_info->id,'is_html' => 1];
 
                     }
                 }else{

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

@@ -2117,22 +2117,13 @@
 
                     axios.post("{{route('recruit.save_sign_up')}}",Qs.stringify(this.user)).then(response => {
                         if(response.data.status){
-                            if(response.data.is_html == 1){
-                                this.$alert(response.data.msg, '提交成功', {
-                                    dangerouslyUseHTMLString: true,
-                                    confirmButtonText: '确定',
-                                    callback: action => {
-                                        window.location.reload();
-                                    }
-                                });
-                            }else{
-                                this.$alert(response.data.msg, '提交成功', {
-                                    confirmButtonText: '确定',
-                                    callback: action => {
-                                        window.location.reload();
-                                    }
-                                });
-                            }
+                            this.$alert(response.data.msg, '提交成功', {
+                                confirmButtonText: '确定',
+                                callback: action => {
+                                    window.location.reload();
+                                }
+                            });
+
                         }else{
                             this.$message.error(response.data.msg);
                             this.loading.close();
@@ -2242,12 +2233,23 @@
 
                                 axios.post("{{route('recruit.save_sign_up')}}",Qs.stringify(this.user)).then(response => {
                                     if(response.data.status){
-                                        this.$alert(response.data.msg, '提交成功', {
-                                            confirmButtonText: '确定',
-                                            callback: action => {
-                                                window.location.reload();
-                                            }
-                                        });
+                                        if(response.data.is_html == 1){
+                                            this.$alert(response.data.msg, '提交成功', {
+                                                dangerouslyUseHTMLString: true,
+                                                confirmButtonText: '确定',
+                                                callback: action => {
+                                                    window.location.reload();
+                                                }
+                                            });
+
+                                        }else{
+                                            this.$alert(response.data.msg, '提交成功', {
+                                                confirmButtonText: '确定',
+                                                callback: action => {
+                                                    window.location.reload();
+                                                }
+                                            });
+                                        }
                                     }else{
                                         this.$message.error(response.data.msg);
                                         this.loading.close();