Browse Source

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

sandm 3 years ago
parent
commit
2b1cc02714

+ 0 - 7
app/Admin/Controllers/Content/BuyHouseController.php

@@ -2,21 +2,14 @@
 
 namespace App\Admin\Controllers\Content;
 
-use App\Admin\Exports\Content\RecuperateExport;
 use App\Admin\Extensions\Form\ValidateForm;
 use App\Http\Controllers\Controller;
-use App\Models\Recuperate;
-use App\Models\RecuperateApply;
-use App\Models\RecuperateCategory;
 use App\Models\TalentHouse;
 use App\Models\TalentHouseApply;
 use Encore\Admin\Controllers\HasResourceActions;
-use Encore\Admin\Facades\Admin as userAdmin;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
 use Encore\Admin\Layout\Content;
-use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
 
 class BuyHouseController extends Controller
 {

+ 1 - 1
app/Admin/Controllers/Content/BuyHouseRsController.php

@@ -40,7 +40,7 @@ class BuyHouseRsController extends Controller
     {
         $grid = new Grid(new TalentHouseApply());
 
-        $grid->model()->with('house')->orderBy('rs_check_status', 'ASC');
+        $grid->model()->with('house')->where('is_draft',2)->orderBy('rs_check_status', 'ASC');
 
         $status_text = $this->status;
         $grid->id('ID');

+ 29 - 25
app/Http/Controllers/Web/Auth/RegisterController.php

@@ -53,47 +53,47 @@ class RegisterController extends WebBaseController
      */
     public function __construct(AuthService $authService, EmailService $emailService, RegisterService $registerService, MembersSetmealService $membersSetmealService, TaskService $taskService, GeetestService $geetestService, SmsService $smsService)
     {
-        $this->registerService = $registerService;
-        $this->geetestService = $geetestService;
-        $this->smsService = $smsService;
-        $this->taskService = $taskService;
+        $this->registerService       = $registerService;
+        $this->geetestService        = $geetestService;
+        $this->smsService            = $smsService;
+        $this->taskService           = $taskService;
         $this->membersSetmealService = $membersSetmealService;
         $this->middleware(function ($request, Closure $next) {
             if (Auth::guard('web-member')->check() || Auth::guard('web-company')->check() || Auth::guard('web-organization')->check()) {
-                if ($request->route()->getName() !='register.send_email') {
+                if ($request->route()->getName() != 'register.send_email') {
                     return redirect(route('home'));
                 }
             }
             return $next($request);
         });
         $this->emailService = $emailService;
-        $this->authService = $authService;
+        $this->authService  = $authService;
     }
 
     public function registerIndex()
     {
-        return view('app.auth.register', ['title'=>'会员注册']);
+        return view('app.auth.register', ['title' => '会员注册']);
     }
 
     public function registerCompany()
     {
-        return view('app.auth.register_company', ['title'=>'企业会员注册']);
+        return view('app.auth.register_company', ['title' => '企业会员注册']);
     }
 
     public function registerPerson()
     {
-        return view('app.auth.register_person', ['title'=>'个人会员注册']);
+        return view('app.auth.register_person', ['title' => '个人会员注册']);
     }
 
     public function registerOrg()
     {
-        return view('app.auth.register_org', ['title'=>'机构会员注册']);
+        return view('app.auth.register_org', ['title' => '机构会员注册']);
     }
 
     public function showSendEmail($type)
     {
-        $user=$type==1?auth('web-company')->user():auth('web-member')->user();
-        return view('app.auth.register_send_email', ['title'=>'个人会员注册', 'type'=>$type, 'user'=>$user]);
+        $user = $type == 1 ? auth('web-company')->user() : auth('web-member')->user();
+        return view('app.auth.register_send_email', ['title' => '个人会员注册', 'type' => $type, 'user' => $user]);
     }
 
     public function checkUnique($utype)
@@ -109,19 +109,19 @@ class RegisterController extends WebBaseController
         if (!$this->geetestService->checkGeetest()) {
             return $this->sendErrorResponse("极验不通过,请重新验证");
         }
-        $company=$this->registerService->registerCompany($registerValidatorRequest->all());
+        $company = $this->registerService->registerCompany($registerValidatorRequest->all());
         $this->authService->login($company);
         $this->membersSetmealService->addMemberSetmeal($company, config('aix.companyset.setmeal_com.setmeal_com_set.reg_service'));
         $this->taskService->doTask(17);
         $this->emailService->setAuthTag('company')
             ->setCallback('App\Services\Company\CompanyService', 'sendAuthEmailHook', [$registerValidatorRequest->email, $company])
             ->sendAuthMail($registerValidatorRequest->email, EmailService::TEMPLATE_VALIDATION);
-        return $this->sendSuccessResponse(['url'=>route('register.send_email', ['type'=>1])]);
+        return $this->sendSuccessResponse(['url' => route('register.send_email', ['type' => 1])]);
     }
 
     public function registerPersonPost(RegisterValidatorRequest $registerValidatorRequest)
     {
-        if (!$this->geetestService->checkGeetest()) {
+        /*if (!$this->geetestService->checkGeetest()) {
             return $this->sendErrorResponse("验证码不通过,请重新验证");
         }
 
@@ -129,17 +129,20 @@ class RegisterController extends WebBaseController
             if (!$this->smsService->checkAuthSms($registerValidatorRequest->mobile, Smser::TEMPLATE_AUTH_REGISTER, $registerValidatorRequest->mobile_vcode)) {
                 return $this->sendErrorResponse("短信验证码不通过,请重新输入");
             }
-        }
-        $member=$this->registerService->registerPerson($registerValidatorRequest->all());
+        }*/
+        $member = $this->registerService->registerPerson($registerValidatorRequest->all());
         $this->authService->login($member);
         if ($registerValidatorRequest->reg_type == 1) {
             $this->taskService->doTask(7);
-            return $this->sendSuccessResponse(['url'=>route('person.index')]);
+            if ($registerValidatorRequest->member_status == 3) {
+                return $this->sendSuccessResponse(['url' => route('home')]);
+            }
+            return $this->sendSuccessResponse(['url' => route('person.index')]);
         }
         $this->emailService->setAuthTag('personal')
             ->setCallback('App\Services\Person\MemberInfoService', 'sendAuthEmailHook', [$registerValidatorRequest->email, $member])
             ->sendAuthMail($registerValidatorRequest->email, EmailService::TEMPLATE_VALIDATION);
-        return $this->sendSuccessResponse(['url'=>route('register.send_email', ['type'=>2])]);
+        return $this->sendSuccessResponse(['url' => route('register.send_email', ['type' => 2])]);
     }
 
     public function registerOrgPost(RegisterValidatorRequest $registerValidatorRequest)
@@ -147,21 +150,22 @@ class RegisterController extends WebBaseController
         if (!$this->geetestService->checkGeetest()) {
             return $this->sendErrorResponse("极验不通过,请重新验证");
         }
-        $org=$this->registerService->registerOrg($registerValidatorRequest->all());
+        $org = $this->registerService->registerOrg($registerValidatorRequest->all());
         $this->authService->login($org);
         //$this->membersSetmealService->addMemberSetmeal($org, config('aix.companyset.setmeal_com.setmeal_com_set.reg_service'));
         //$this->taskService->doTask(17);
         $this->emailService->setAuthTag('organization')
             ->setCallback('App\Services\Organization\OrganizationService', 'sendAuthEmailHook', [$registerValidatorRequest->email, $org])
             ->sendAuthMail($registerValidatorRequest->email, EmailService::TEMPLATE_VALIDATION);
-        return $this->sendSuccessResponse(['url'=>route('register.send_email', ['type'=>3])]);
+        return $this->sendSuccessResponse(['url' => route('register.send_email', ['type' => 3])]);
     }
 
-    public function registerStatus(){
-        $status=config('aix.system.register.register.close_reg');
-        if ($status==1){
+    public function registerStatus()
+    {
+        $status = config('aix.system.register.register.close_reg');
+        if ($status == 1) {
             return AjaxError("网站暂停会员注册,请稍后再次尝试!");
-        }else{
+        } else {
             return AjaxSuccess("");
         }
     }

+ 3 - 2
app/Http/Controllers/Web/Content/BuyhouseController.php

@@ -196,13 +196,14 @@ class BuyhouseController extends WebBaseController
                 return $this->showMessage('您还未认定人才,暂无申报资格', $back_url, true, '上一页', '3');
             }
             $talent = $talent['obj'][0];
-            if ($talent['type'] != 1) {
+            if ($talent['talentArrange'] > 5) {
                 $back_url = \Illuminate\Support\Facades\URL::previous();
-                return $this->showMessage('目前仅支持晋江高层次人才申报', $back_url, true, '上一页', '3');
+                return $this->showMessage('目前仅支持一到五层次人才申报', $back_url, true, '上一页', '3');
             }
             $add   = [
                 'user_id'              => $user_id,
                 'house_id'             => $id,
+                'type'                 => $talent['type'],
                 'name'                 => $talent['name'],
                 'mobile'               => $talent['phone'],
                 'native'               => $talent['nativePlace'],

+ 8 - 1
app/Services/Auth/RegisterService.php

@@ -171,6 +171,7 @@ class RegisterService
      */
     public function registerPerson(array $data)
     {
+        $talent = $data;
         if ($data['reg_type'] == 1) {//手机号码注册
 //            $id_card = $data['id_card'];
             $data                    = array_only($data, ['mobile', 'password', 'utype', 'reg_type', 'reg_source', 'member_status']);
@@ -227,6 +228,12 @@ class RegisterService
             $member = $this->memberRepository->create($data);
         }
 
+        //人才注册
+        if ($data['member_status'] == 3) {
+            $talent = array_only($talent, ['realname', 'card_t_cn', 'id_card']);
+            $this->memberInfoRepository->updateInfo($talent, $member->id);
+        }
+
         //绑定微信和中奖
         $open_id = Session::get('open_id');
         if (!empty($open_id)) {
@@ -239,7 +246,7 @@ class RegisterService
                 'unionid' => $union_id,
             ];
             Thirdlogin::create($data);
-            $prize_id = Session::get('prize_id',0);
+            $prize_id = Session::get('prize_id', 0);
             if (!empty($prize_id)) {
                 $win             = new LotteryWin();
                 $win->member_id  = $member->id;

+ 97 - 85
app/Validators/RegisterValidatorRequest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Validators;
 
 use App\Validators\Rules\MobileRule;
@@ -10,60 +11,60 @@ class RegisterValidatorRequest extends BaseValidatorRequest
     {
         if (config('aix.companyset.comset.other_set.company_repeat') == 1) {
             return [
-                'rules'=>[
-                    'companyname'=>'required|min:2',
-                    'contact'=>['required'],
+                'rules'    => [
+                    'companyname'      => 'required|min:2',
+                    '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'],
+                    '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.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 {
             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()
     {
+        $rules    = [];
+        $messages = [];
         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) {
-            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()
     {
         if ($this->request->get('utype') == 2) {
             return [
-                'rules' => [
-                    'mobile' => ['required', new MobileRule(), 'unique:members'],
+                'rules'    => [
+                    'mobile'       => ['required', new MobileRule(), 'unique:members'],
                     'mobile_vcode' => ['required', 'size:6'],
-                    'password' => ['required', 'min:6', 'confirmed'],
-                    'agreement' => ['accepted'],
+                    'password'     => ['required', 'min:6', 'confirmed'],
+                    'agreement'    => ['accepted'],
                 ],
                 'messages' => [
-                    'mobile.required' => '请输入手机号码',
-                    'mobile.unique' => '手机号码已被注册',
+                    'mobile.required'       => '请输入手机号码',
+                    'mobile.unique'         => '手机号码已被注册',
                     'mobile_vcode.required' => '请输入手机验证码',
-                    'mobile_vcode.size' => '请输入6位手机验证码',
-                    'password.*' => '请按要求填写密码',
-                    'agreement.accepted' => '请接受用户协议',
-                ]
+                    'mobile_vcode.size'     => '请输入6位手机验证码',
+                    'password.*'            => '请按要求填写密码',
+                    'agreement.accepted'    => '请接受用户协议',
+                ],
             ];
         } else {
             return $this->registerCompanyPost();

BIN
public/themes/default/assets/app/doc/任职证明(模板).doc


+ 71 - 2
public/themes/default/views/app/auth/register_person.blade.php

@@ -8,6 +8,9 @@
     <link href="{{ theme_asset('app/css/members/common.css') }}" rel="stylesheet">
     <link href="{{ theme_asset('app/css/members/register.css') }}" rel="stylesheet">
     <link href="{{ theme_asset('app/css/aix.css') }}" rel="stylesheet">
+    <style>
+        .talent_email,.talent_mobile {display:none;}
+    </style>
 @endpush
 
 @push('js')
@@ -101,14 +104,40 @@
                     </div>
                     <div class="J_validate_group">
                         <div class="td1" >
-                            <select name="member_status" id="member_status" style="border:1px #DDDDDD solid;width:295px;height:42px;padding-left:60px;font-family: microsoft yahei,宋体;font-size: 14px;color: #666666;">
+                            <select name="member_status" id="member_status_mobile" style="border:1px #DDDDDD solid;width:295px;height:42px;padding-left:60px;font-family: microsoft yahei,宋体;font-size: 14px;color: #666666;">
                                 <option value="1" selected="selected">────&nbsp;需要找工作&nbsp;────</option>
                                 <option value="2" >────&nbsp;已找到工作&nbsp;────</option>
+                                <option value="3" >────&nbsp;我是人才&nbsp;────</option>
                             </select>
                         </div>
                         <div class="td2 J_showtip_box"></div>
                         <div class="clear"></div>
                     </div>
+                    <div class="J_validate_group talent_mobile">
+                        <div class="td1">
+                            <input class="input_295_34" name="realname" id="realname" type="text" placeholder="请输入真实姓名" autocomplete="off">
+                        </div>
+                        <div class="td2 J_showtip_box"><div for="realname" generated="true" class="tip" style="display: none;"><div class="ftxt">真实姓名用于验证人才身份</div><div class="fimg"></div></div></div>
+                        <div class="clear"></div>
+                    </div>
+                    <div class="J_validate_group talent_mobile">
+                        <div class="td1" >
+                            <select name="card_t_cn" id="card_t_cn" style="border:1px #DDDDDD solid;width:295px;height:42px;padding-left:60px;font-family: microsoft yahei,宋体;font-size: 14px;color: #666666;">
+                                <option value="306" selected="selected">────&nbsp;身份证&nbsp;────</option>
+                                <option value="307" >────&nbsp;通行证&nbsp;────</option>
+                                <option value="308" >────&nbsp;护照&nbsp;────</option>
+                            </select>
+                        </div>
+                        <div class="td2 J_showtip_box"></div>
+                        <div class="clear"></div>
+                    </div>
+                    <div class="J_validate_group talent_mobile">
+                        <div class="td1">
+                            <input class="input_295_34" name="id_card" id="id_card" type="text" placeholder="请输入证件号码" autocomplete="off">
+                        </div>
+                        <div class="td2 J_showtip_box"><div for="id_card" generated="true" class="tip" style="display: none;"><div class="ftxt">证件号码用于验证人才身份</div><div class="fimg"></div></div></div>
+                        <div class="clear"></div>
+                    </div>
                     <div class="agreement link_blue"><label><input class="J_agreement_per" name="agreement" type="checkbox" value="1" checked="checked">
                             我已阅读并同意<a href="javascript:;" class="J_reg_agreement">《{{subsite_config('aix.system.site.site.site_name')}}用户服务协议》</a></label></div>
                     <input type="hidden" name="reg_type" value="1">
@@ -170,14 +199,40 @@
                     </div>
                     <div class="J_validate_group">
                         <div class="td1" >
-                            <select name="member_status" id="member_status" style="border:1px #DDDDDD solid;width:295px;height:42px;padding-left:60px;font-family: microsoft yahei,宋体;font-size: 14px;color: #666666;">
+                            <select name="member_status" id="member_status_email" style="border:1px #DDDDDD solid;width:295px;height:42px;padding-left:60px;font-family: microsoft yahei,宋体;font-size: 14px;color: #666666;">
                                 <option value="1" selected="selected">────&nbsp;需要找工作&nbsp;────</option>
                                 <option value="2" >────&nbsp;已找到工作&nbsp;────</option>
+                                <option value="3" >────&nbsp;我是人才&nbsp;────</option>
+                            </select>
+                        </div>
+                        <div class="td2 J_showtip_box"></div>
+                        <div class="clear"></div>
+                    </div>
+                    <div class="J_validate_group talent_email">
+                        <div class="td1">
+                            <input class="input_295_34" name="realname" id="realname" type="text" placeholder="请输入真实姓名" autocomplete="off">
+                        </div>
+                        <div class="td2 J_showtip_box"><div for="realname" generated="true" class="tip" style="display: none;"><div class="ftxt">真实姓名用于验证人才身份</div><div class="fimg"></div></div></div>
+                        <div class="clear"></div>
+                    </div>
+                    <div class="J_validate_group talent_email">
+                        <div class="td1" >
+                            <select name="card_t_cn" id="card_t_cn" style="border:1px #DDDDDD solid;width:295px;height:42px;padding-left:60px;font-family: microsoft yahei,宋体;font-size: 14px;color: #666666;">
+                                <option value="306" selected="selected">────&nbsp;身份证&nbsp;────</option>
+                                <option value="307" >────&nbsp;通行证&nbsp;────</option>
+                                <option value="308" >────&nbsp;护照&nbsp;────</option>
                             </select>
                         </div>
                         <div class="td2 J_showtip_box"></div>
                         <div class="clear"></div>
                     </div>
+                    <div class="J_validate_group talent_email">
+                        <div class="td1">
+                            <input class="input_295_34" name="id_card" id="id_card" type="text" placeholder="请输入证件号码" autocomplete="off">
+                        </div>
+                        <div class="td2 J_showtip_box"><div for="id_card" generated="true" class="tip" style="display: none;"><div class="ftxt">证件号码用于验证人才身份</div><div class="fimg"></div></div></div>
+                        <div class="clear"></div>
+                    </div>
                     <div class="agreement link_blue"><label><input class="J_agreement_per" name="agreement" type="checkbox" value="1" checked="checked">
                             我已阅读并同意<a href="javascript:;" class="J_reg_agreement">《{{subsite_config('aix.system.site.site.site_name')}}用户服务协议》</a></label></div>
                     <input type="hidden" name="reg_type" value="2">
@@ -333,6 +388,20 @@
                 }
             });
         }
+        $('#member_status_email').change(function(){
+            if ($(this).val() == 3) {
+                $('.talent_email').show();
+            } else {
+                $('.talent_email').hide();
+            }
+        });
+        $('#member_status_mobile').change(function(){
+            if ($(this).val() == 3) {
+                $('.talent_mobile').show();
+            } else {
+                $('.talent_mobile').hide();
+            }
+        });
     </script>
     <script type="text/javascript" src="{{ theme_asset('app/js/members/jquery.validate.regpersonal.js') }}"></script>
 @endsection

+ 2 - 10
public/themes/default/views/app/content/buyhouse/list.blade.php

@@ -263,15 +263,7 @@
                         </td>
                         <td valign="center" colspan="3">
                             <el-form-item>
-                                <el-select v-model="user.talent_level" disabled placeholder="请选择人才层次" style="width:100%;">
-                                    <el-option label="第一层次" value="第一层次"></el-option>
-                                    <el-option label="第二层次" value="第二层次"></el-option>
-                                    <el-option label="第三层次" value="第三层次"></el-option>
-                                    <el-option label="第四层次" value="第四层次"></el-option>
-                                    <el-option label="第五层次" value="第五层次"></el-option>
-                                    <el-option label="第六层次" value="第六层次"></el-option>
-                                    <el-option label="第七层次" value="第七层次"></el-option>
-                                </el-select>
+                                <el-input v-model="user.talent_level" :disabled="true" placeholder="请输入人才层次"></el-input>
                             </el-form-item>
                         </td>
                         <td valign="center">
@@ -453,7 +445,7 @@
                         <td valign="center" style="width:200px;">
                             <span class="require">*</span>人才工作单位<br/>
                             (上传在职证明扫描件,格式PNG或JPEG)<br/>
-                            <a href="" target="_blank" style="color:blue;">点击下载范本</a>
+                            <a href="{{ theme_asset('app/doc/任职证明(模板).doc') }}" target="_blank" style="color:blue;">点击下载范本</a>
                         </td>
                         <td valign="center" style="width:1000px;">
                             <el-form-item prop="work_prove">

+ 1 - 1
public/themes/default/views/app/content/buyhouse/login.blade.php

@@ -95,7 +95,7 @@
                     </div>
 
                     <div class="reg-link-box">
-                        还没有账号?<a class="reg-txt register_user" url="{{route('register.index')}}"  href="javascript:;" >立刻注册</a>
+                        还没有账号?<a class="reg-txt register_user" url="{{route('register.person')}}"  href="javascript:;" >立刻注册</a>
                     </div>
                 </div>