Merge remote-tracking branch 'origin/master'

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

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

@@ -2117,12 +2117,22 @@
 
                     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();