|
@@ -1,4 +1,5 @@
|
|
<?php
|
|
<?php
|
|
|
|
+
|
|
namespace App\Validators;
|
|
namespace App\Validators;
|
|
|
|
|
|
use App\Validators\Rules\MobileRule;
|
|
use App\Validators\Rules\MobileRule;
|
|
@@ -10,60 +11,60 @@ class RegisterValidatorRequest extends BaseValidatorRequest
|
|
{
|
|
{
|
|
if (config('aix.companyset.comset.other_set.company_repeat') == 1) {
|
|
if (config('aix.companyset.comset.other_set.company_repeat') == 1) {
|
|
return [
|
|
return [
|
|
- 'rules'=>[
|
|
|
|
- 'companyname'=>'required|min:2',
|
|
|
|
- 'contact'=>['required'],
|
|
|
|
|
|
+ 'rules' => [
|
|
|
|
+ 'companyname' => 'required|min:2',
|
|
|
|
+ 'contact' => ['required'],
|
|
//'company_mobile'=>['required',new MobileRule(),'unique:companys,mobile'],
|
|
//'company_mobile'=>['required',new MobileRule(),'unique:companys,mobile'],
|
|
- 'username'=>['required',new UsernameRule(),'min:6','unique:companys'],
|
|
|
|
- 'email'=>['required','email','unique:companys'],
|
|
|
|
- 'company_password'=>['required','min:6','confirmed'],
|
|
|
|
- 'agreement'=>['accepted'],
|
|
|
|
|
|
+ 'username' => ['required', new UsernameRule(), 'min:6', 'unique:companys'],
|
|
|
|
+ 'email' => ['required', 'email', 'unique:companys'],
|
|
|
|
+ 'company_password' => ['required', 'min:6', 'confirmed'],
|
|
|
|
+ 'agreement' => ['accepted'],
|
|
],
|
|
],
|
|
- 'messages'=>[
|
|
|
|
- 'companyname.required'=>'请输入企业名称',
|
|
|
|
- 'companyname.min'=>'企业名称字数最少为2',
|
|
|
|
- 'contact.required'=>'请输入企业联系人',
|
|
|
|
|
|
+ 'messages' => [
|
|
|
|
+ 'companyname.required' => '请输入企业名称',
|
|
|
|
+ 'companyname.min' => '企业名称字数最少为2',
|
|
|
|
+ 'contact.required' => '请输入企业联系人',
|
|
//'company_mobile.required'=>'请输入手机号码',
|
|
//'company_mobile.required'=>'请输入手机号码',
|
|
- // 'company_mobile.unique'=>'手机号码已被注册',
|
|
|
|
- 'username.required'=>'请输入用户名',
|
|
|
|
- 'username.alpha_dash'=>'',
|
|
|
|
- 'username.min'=>'企业名称字数最少为6',
|
|
|
|
- 'username.unique'=>'企业名称已存在',
|
|
|
|
- 'email.required'=>'请输入邮箱',
|
|
|
|
- 'email.email'=>'邮箱格式不对',
|
|
|
|
- 'email.unique'=>'邮箱已被注册',
|
|
|
|
- 'company_password.*'=>'请按要求填写密码',
|
|
|
|
- 'agreement.accepted'=>'请接受协议',
|
|
|
|
- ]
|
|
|
|
|
|
+ // 'company_mobile.unique'=>'手机号码已被注册',
|
|
|
|
+ 'username.required' => '请输入用户名',
|
|
|
|
+ 'username.alpha_dash' => '',
|
|
|
|
+ 'username.min' => '企业名称字数最少为6',
|
|
|
|
+ 'username.unique' => '企业名称已存在',
|
|
|
|
+ 'email.required' => '请输入邮箱',
|
|
|
|
+ 'email.email' => '邮箱格式不对',
|
|
|
|
+ 'email.unique' => '邮箱已被注册',
|
|
|
|
+ 'company_password.*' => '请按要求填写密码',
|
|
|
|
+ 'agreement.accepted' => '请接受协议',
|
|
|
|
+ ],
|
|
];
|
|
];
|
|
} else {
|
|
} else {
|
|
return [
|
|
return [
|
|
- 'rules'=>[
|
|
|
|
- 'companyname'=>'required|min:2|unique:companys',
|
|
|
|
- 'contact'=>['required'],
|
|
|
|
- // 'company_mobile'=>['required',new MobileRule(),'unique:companys,mobile'],
|
|
|
|
- 'username'=>['required',new UsernameRule(),'min:6','unique:companys'],
|
|
|
|
- 'email'=>['required','email','unique:companys'],
|
|
|
|
- 'company_password'=>['required','min:6','confirmed'],
|
|
|
|
- 'agreement'=>['accepted'],
|
|
|
|
|
|
+ 'rules' => [
|
|
|
|
+ 'companyname' => 'required|min:2|unique:companys',
|
|
|
|
+ 'contact' => ['required'],
|
|
|
|
+ // 'company_mobile'=>['required',new MobileRule(),'unique:companys,mobile'],
|
|
|
|
+ 'username' => ['required', new UsernameRule(), 'min:6', 'unique:companys'],
|
|
|
|
+ 'email' => ['required', 'email', 'unique:companys'],
|
|
|
|
+ 'company_password' => ['required', 'min:6', 'confirmed'],
|
|
|
|
+ 'agreement' => ['accepted'],
|
|
|
|
+ ],
|
|
|
|
+ 'messages' => [
|
|
|
|
+ 'companyname.required' => '请输入企业名称',
|
|
|
|
+ 'companyname.min' => '企业名称字数最少为2',
|
|
|
|
+ 'companyname.unique' => '企业名称已存在',
|
|
|
|
+ 'contact.required' => '请输入企业联系人',
|
|
|
|
+ // 'company_mobile.required'=>'请输入手机号码',
|
|
|
|
+ // 'company_mobile.unique'=>'手机号码已被注册',
|
|
|
|
+ 'username.required' => '请输入用户名',
|
|
|
|
+ 'username.alpha_dash' => '',
|
|
|
|
+ 'username.min' => '企业名称字数最少为6',
|
|
|
|
+ 'username.unique' => '企业名称已存在',
|
|
|
|
+ 'email.required' => '请输入邮箱',
|
|
|
|
+ 'email.email' => '邮箱格式不对',
|
|
|
|
+ 'email.unique' => '邮箱已被注册',
|
|
|
|
+ 'company_password.*' => '请按要求填写密码',
|
|
|
|
+ 'agreement.accepted' => '请接受协议',
|
|
],
|
|
],
|
|
- 'messages'=>[
|
|
|
|
- 'companyname.required'=>'请输入企业名称',
|
|
|
|
- 'companyname.min'=>'企业名称字数最少为2',
|
|
|
|
- 'companyname.unique'=>'企业名称已存在',
|
|
|
|
- 'contact.required'=>'请输入企业联系人',
|
|
|
|
- // 'company_mobile.required'=>'请输入手机号码',
|
|
|
|
- // 'company_mobile.unique'=>'手机号码已被注册',
|
|
|
|
- 'username.required'=>'请输入用户名',
|
|
|
|
- 'username.alpha_dash'=>'',
|
|
|
|
- 'username.min'=>'企业名称字数最少为6',
|
|
|
|
- 'username.unique'=>'企业名称已存在',
|
|
|
|
- 'email.required'=>'请输入邮箱',
|
|
|
|
- 'email.email'=>'邮箱格式不对',
|
|
|
|
- 'email.unique'=>'邮箱已被注册',
|
|
|
|
- 'company_password.*'=>'请按要求填写密码',
|
|
|
|
- 'agreement.accepted'=>'请接受协议',
|
|
|
|
- ]
|
|
|
|
];
|
|
];
|
|
}
|
|
}
|
|
|
|
|
|
@@ -72,59 +73,70 @@ class RegisterValidatorRequest extends BaseValidatorRequest
|
|
|
|
|
|
public function registerPersonPost()
|
|
public function registerPersonPost()
|
|
{
|
|
{
|
|
|
|
+ $rules = [];
|
|
|
|
+ $messages = [];
|
|
if ($this->request->get('reg_type') == 1) {
|
|
if ($this->request->get('reg_type') == 1) {
|
|
- return [
|
|
|
|
- 'rules'=>[
|
|
|
|
- 'mobile'=>['required',new MobileRule(),'unique:members'],
|
|
|
|
- 'mobile_vcode'=>['required','size:6'],
|
|
|
|
- 'password'=>['required','min:6','confirmed'],
|
|
|
|
- 'agreement'=>['accepted'],
|
|
|
|
- ],
|
|
|
|
- 'messages'=>[
|
|
|
|
- 'mobile.required'=>'请输入手机号码',
|
|
|
|
- 'mobile.unique'=>'手机号码已被注册',
|
|
|
|
- 'mobile_vcode.required'=>'请输入手机验证码',
|
|
|
|
- 'mobile_vcode.size'=>'请输入6位手机验证码',
|
|
|
|
- 'password.*'=>'请按要求填写密码',
|
|
|
|
- 'agreement.accepted'=>'请接受用户协议',
|
|
|
|
- ]
|
|
|
|
|
|
+ $rules = [
|
|
|
|
+ 'mobile' => ['required', new MobileRule(), 'unique:members'],
|
|
|
|
+ 'mobile_vcode' => ['required', 'size:6'],
|
|
|
|
+ 'password' => ['required', 'min:6', 'confirmed'],
|
|
|
|
+ 'agreement' => ['accepted'],
|
|
|
|
+ ];
|
|
|
|
+ $messages = [
|
|
|
|
+ 'mobile.required' => '请输入手机号码',
|
|
|
|
+ 'mobile.unique' => '手机号码已被注册',
|
|
|
|
+ 'mobile_vcode.required' => '请输入手机验证码',
|
|
|
|
+ 'mobile_vcode.size' => '请输入6位手机验证码',
|
|
|
|
+ 'password.*' => '请按要求填写密码',
|
|
|
|
+ 'agreement.accepted' => '请接受用户协议',
|
|
];
|
|
];
|
|
} elseif ($this->request->get('reg_type') == 2) {
|
|
} elseif ($this->request->get('reg_type') == 2) {
|
|
- return [
|
|
|
|
- 'rules'=>[
|
|
|
|
- 'email'=>['required','email','unique:members'],
|
|
|
|
- 'password'=>['required','min:6','confirmed'],
|
|
|
|
- 'agreement'=>['accepted'],
|
|
|
|
- ],
|
|
|
|
- 'messages'=>[
|
|
|
|
- 'email.required'=>'请输入邮箱',
|
|
|
|
- 'email.email'=>'邮箱格式不对',
|
|
|
|
- 'email.unique'=>'邮箱已被注册',
|
|
|
|
- 'password.*'=>'请按要求填写密码',
|
|
|
|
- 'agreement.accepted'=>'请接受协议',
|
|
|
|
- ]
|
|
|
|
|
|
+ $rules = [
|
|
|
|
+ 'email' => ['required', 'email', 'unique:members'],
|
|
|
|
+ 'password' => ['required', 'min:6', 'confirmed'],
|
|
|
|
+ 'agreement' => ['accepted'],
|
|
|
|
+ ];
|
|
|
|
+ $messages = [
|
|
|
|
+ 'email.required' => '请输入邮箱',
|
|
|
|
+ 'email.email' => '邮箱格式不对',
|
|
|
|
+ 'email.unique' => '邮箱已被注册',
|
|
|
|
+ 'password.*' => '请按要求填写密码',
|
|
|
|
+ 'agreement.accepted' => '请接受协议',
|
|
];
|
|
];
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if ($this->request->get('member_status') == 3) {
|
|
|
|
+ $rules = array_merge($rules, [
|
|
|
|
+ 'realname' => ['required'],
|
|
|
|
+ 'id_card' => ['required'],
|
|
|
|
+ ]);
|
|
|
|
+ $messages = array_merge($messages, [
|
|
|
|
+ 'realname.required' => '请输入真实姓名',
|
|
|
|
+ 'id_card.required' => '请输入证件号码',
|
|
|
|
+ ]);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return ['rules' => $rules, 'messages' => $messages];
|
|
}
|
|
}
|
|
|
|
|
|
public function bindNewAccountPost()
|
|
public function bindNewAccountPost()
|
|
{
|
|
{
|
|
if ($this->request->get('utype') == 2) {
|
|
if ($this->request->get('utype') == 2) {
|
|
return [
|
|
return [
|
|
- 'rules' => [
|
|
|
|
- 'mobile' => ['required', new MobileRule(), 'unique:members'],
|
|
|
|
|
|
+ 'rules' => [
|
|
|
|
+ 'mobile' => ['required', new MobileRule(), 'unique:members'],
|
|
'mobile_vcode' => ['required', 'size:6'],
|
|
'mobile_vcode' => ['required', 'size:6'],
|
|
- 'password' => ['required', 'min:6', 'confirmed'],
|
|
|
|
- 'agreement' => ['accepted'],
|
|
|
|
|
|
+ 'password' => ['required', 'min:6', 'confirmed'],
|
|
|
|
+ 'agreement' => ['accepted'],
|
|
],
|
|
],
|
|
'messages' => [
|
|
'messages' => [
|
|
- 'mobile.required' => '请输入手机号码',
|
|
|
|
- 'mobile.unique' => '手机号码已被注册',
|
|
|
|
|
|
+ 'mobile.required' => '请输入手机号码',
|
|
|
|
+ 'mobile.unique' => '手机号码已被注册',
|
|
'mobile_vcode.required' => '请输入手机验证码',
|
|
'mobile_vcode.required' => '请输入手机验证码',
|
|
- 'mobile_vcode.size' => '请输入6位手机验证码',
|
|
|
|
- 'password.*' => '请按要求填写密码',
|
|
|
|
- 'agreement.accepted' => '请接受用户协议',
|
|
|
|
- ]
|
|
|
|
|
|
+ 'mobile_vcode.size' => '请输入6位手机验证码',
|
|
|
|
+ 'password.*' => '请按要求填写密码',
|
|
|
|
+ 'agreement.accepted' => '请接受用户协议',
|
|
|
|
+ ],
|
|
];
|
|
];
|
|
} else {
|
|
} else {
|
|
return $this->registerCompanyPost();
|
|
return $this->registerCompanyPost();
|