Quellcode durchsuchen

Merge remote-tracking branch 'origin/master'

zmw vor 3 Monaten
Ursprung
Commit
c6008651c7

+ 4 - 4
app/Http/Controllers/Mobile/Active/SpringController.php

@@ -153,7 +153,7 @@ class SpringController extends MobileBaseController
             $district_arr = ["%.{$select_id}%", "%{$select_id}.%"];
             $title        = $citys['select']['name'] . '专区';
         }
-        $whereRaw = "jobs.updated_at > '2024-01-01 00:00:00' and jobs.deleted_at is null and jobs.valid = 1 and jobs.audit = 1 and jobs.display = 1";
+        $whereRaw = "jobs.updated_at > '2025-01-01 00:00:00' and jobs.deleted_at is null and jobs.valid = 1 and jobs.audit = 1 and jobs.display = 1";
         $companys = DB::table('jobs')->join('companys', 'jobs.company_id', '=', 'companys.id')->whereRaw($whereRaw)->groupBy('jobs.company_id')->select('jobs.company_id')->pluck('company_id')->toArray();
 
         $where   = [];
@@ -296,7 +296,7 @@ class SpringController extends MobileBaseController
         $limit  = 8;
 
         $citycategory = 'jjkfq';
-        $whereRaw     = "jobs.updated_at > '2024-01-01 00:00:00' and jobs.deleted_at is null and jobs.valid = 1 and jobs.audit = 1 and jobs.display = 1";
+        $whereRaw     = "jobs.updated_at > '2025-01-01 00:00:00' and jobs.deleted_at is null and jobs.valid = 1 and jobs.audit = 1 and jobs.display = 1";
         $companys     = DB::table('jobs')->join('companys', 'jobs.company_id', '=', 'companys.id')->whereRaw($whereRaw)->groupBy('jobs.company_id')->select('jobs.company_id')->pluck('company_id')->toArray();
 
 
@@ -444,7 +444,7 @@ class SpringController extends MobileBaseController
         $limit  = 8;
 
         $citycategory = 'jjkfq';
-        $whereRaw     = "jobs.updated_at > '2024-01-01 00:00:00' and jobs.deleted_at is null and jobs.valid = 1 and jobs.audit = 1 and jobs.display = 1";
+        $whereRaw     = "jobs.updated_at > '2025-01-01 00:00:00' and jobs.deleted_at is null and jobs.valid = 1 and jobs.audit = 1 and jobs.display = 1";
         $companys     = DB::table('jobs')->join('companys', 'jobs.company_id', '=', 'companys.id')->whereRaw($whereRaw)->groupBy('jobs.company_id')->select('jobs.company_id')->pluck('company_id')->toArray();
 
 
@@ -577,7 +577,7 @@ class SpringController extends MobileBaseController
             $district_arr = ["%.{$select_id}%", "%{$select_id}.%"];
             $title        = $citys['select']['name'] . '专区';
         }
-        $whereRaw = "jobs.updated_at > '2024-01-01 00:00:00' and jobs.deleted_at is null and jobs.valid = 1 and jobs.audit = 1 and jobs.display = 1";
+        $whereRaw = "jobs.updated_at > '2025-01-01 00:00:00' and jobs.deleted_at is null and jobs.valid = 1 and jobs.audit = 1 and jobs.display = 1";
         $companys = DB::table('jobs')->join('companys', 'jobs.company_id', '=', 'companys.id')->whereRaw($whereRaw)->groupBy('jobs.company_id')->select('jobs.company_id')->pluck('company_id')->toArray();
 
         $where   = [];

+ 3 - 3
app/Services/HomeService.php

@@ -134,9 +134,9 @@ class HomeService
     public function getSpringLive()
     {
         $arr = [
-            ['name' => '新春才市,大咖有约', 'images' => theme_asset('mobile/images/online2021/qrcode_douyin.png') . '?v=3', 'time' => '2月18日 15:00-16:00(正月初九)', 'company' => '', 'status' => 'unstart', 'url' => '#'],
-            ['name' => '综合场', 'images' => theme_asset('mobile/images/online2021/qrcode_douyin.png') . '?v=3', 'time' => '2月20日 15:00-16:30(正月十一)', 'company' => '', 'status' => 'unstart', 'url' => '#'],
-            ['name' => '普技工专场', 'images' => theme_asset('mobile/images/online2021/qrcode_douyin.png') . '?v=3', 'time' => '2月26日 15:00-16:30(正月十七)', 'company' => '', 'status' => 'unstart', 'url' => '#'],
+            ['name' => '求职导航', 'images' => theme_asset('mobile/images/online2021/qrcode_douyin.png') . '?v=3', 'time' => '2月12日 15:00-16:00(正月十五)', 'company' => '', 'status' => 'unstart', 'url' => '#'],
+            ['name' => '综合场', 'images' => theme_asset('mobile/images/online2021/qrcode_douyin.png') . '?v=3', 'time' => '2月13日 15:00-16:30(正月十六)', 'company' => '', 'status' => 'unstart', 'url' => '#'],
+            ['name' => '普技工专场', 'images' => theme_asset('mobile/images/online2021/qrcode_douyin.png') . '?v=3', 'time' => '2月14日 15:00-16:30(正月十七)', 'company' => '', 'status' => 'unstart', 'url' => '#'],
         ];
 
         return $arr;

+ 3 - 0
public/themes/default/assets/mobile/css/online2021.css

@@ -34,6 +34,8 @@ a {text-decoration:none;}
 .online2021_job_fair .btn_one a {color:white;}
 .online2021_job_fair .btn_left {float:left;margin-left:10%;}
 .online2021_job_fair .btn_right {float:right;margin-right:10%;}
+.online2021_job_fair .btn_left a {color:white;}
+.online2021_job_fair .btn_right a {color:white;}
 
 .onine2021_lottery {position: relative;top: -20px;}
 .onine2021_lottery .lottery_logo {display:block;position:relative;z-index:10;width:60%;margin:0 auto;height:120px;}
@@ -48,6 +50,7 @@ a {text-decoration:none;}
 .onine2021_lottery .content_box .description_content {color:black;}
 .onine2021_lottery .content_box .grid {display: flex;flex-wrap: wrap;width:100%;}
 .onine2021_lottery .content_box .grid .grid_item{position: relative;box-sizing: border-box;flex-basis: 50%;}
+.onine2021_lottery .content_box .grid .grid_item.grid_item3{position: relative;box-sizing: border-box;flex-basis: 33%;}
 .onine2021_lottery .content_box .grid .grid_item .grid_item_content {align-items: center;justify-content: center;display: flex;flex-direction: column;box-sizing: border-box;height: 100%;padding: 16px 8px;background-color: #fff;position: relative;}
 .onine2021_lottery .content_box .grid .grid_item .grid_item_content .grid_item_img {width:50px;height:50px;}
 [class*='lw_hairline']::after {

BIN
public/themes/default/assets/mobile/images/online2021/lottery_gift.png


BIN
public/themes/default/assets/mobile/images/online2021/lottery_logo.png


BIN
public/themes/default/assets/mobile/images/online2021/lottery_win.png


BIN
public/themes/default/assets/mobile/images/spring/header_2025.png


+ 202 - 132
public/themes/default/views/jkq/auth/login.blade.php

@@ -13,7 +13,7 @@
 @push('js')
     <script type="text/javascript" src="{{ theme_asset('gt/gt.js') }}"></script>
     <script type="text/javascript" src="{{ theme_asset('gt/gt.handle.js') }}"></script>
-    
+    <script src="https://captcha.253.com/TCaptcha.js"></script>
 @endpush
 
 @section('content')
@@ -34,16 +34,19 @@
                     </div>
                     <!--普通用户登录-->
 
-                        <div class="login-type user-login">
-                            <form id="form_account" action="{{route('jkq.login.account')}}" method="post">
-                                {{ csrf_field() }}
-                                <div id="account"></div>
-                                <div id="message_account"></div>
+                    <div class="login-type user-login">
+                        <form id="form_account" action="{{route('jkq.login.account')}}" method="post">
+                            <input type="hidden" name="ticket" id="ticket">
+                            <input type="hidden" name="bizState" id="bizState">
+                            <input type="hidden" name="randstr" id="randstr">
+                            {{ csrf_field() }}
+                            <div id="account"></div>
+                            <div id="message_account"></div>
                             <div class="form-group yhm">
                                 <div class="imgbg"></div>
                                 <input class="input-login" type="text"  value="" name="account" placeholder="{{trans('auth.member.account.placeholder')}}"/>
                             </div>
-                                <div id="password"></div>
+                            <div id="password"></div>
                             <div class="form-group mm">
                                 <div class="imgbg"></div>
                                 <input  class="input-login" type="password"  value="" name="password" placeholder="请输入密码"/>
@@ -53,33 +56,36 @@
                                 <span class="check-box yes" onclick="checkAutoLogin(this)">下次自动登录</span>
                                 <a class="txt-r" href="{{route('jkq.password.request')}}?utype=user" >忘记密码?</a>
                             </div>
-                                <div>
-                                    <input class="btn-group login-account" type="button" value="登录">
-                                </div>
-                            </form>
-                        </div>
+                            <div>
+                                <input class="btn-group login-account" type="button" value="登录">
+                            </div>
+                        </form>
+                    </div>
 
                     <!--手机登录-->
                     <div class="login-type mob-login" style="display: none;">
                         <form id="form_mobile" action="{{route('jkq.login.sms')}}" method="post">
+                            <input type="hidden" name="ticket" id="ticket1">
+                            <input type="hidden" name="bizState" id="bizState1">
+                            <input type="hidden" name="randstr" id="randstr1">
                             {{ csrf_field() }}
-                        <div id="mobile"></div>
-                        <div id="message_mobile"></div>
-                        <div class="form-group yhm">
-                            <div class="imgbg"></div>
-                            <input  class="input-login" type="text"  value="" name="mobile" placeholder="请输入手机号"/>
-                        </div>
+                            <div id="mobile"></div>
+                            <div id="message_mobile"></div>
+                            <div class="form-group yhm">
+                                <div class="imgbg"></div>
+                                <input  class="input-login" type="text"  value="" name="mobile" placeholder="请输入手机号"/>
+                            </div>
                             <div id="code"></div>
-                        <div class="form-group mm">
-                            <div class="imgbg"></div>
-                            <input  class="input-login code" type="text"  value="" name="code" placeholder="请输入手机验证码"/>
-                            <input type="button"  class="btn-getcode" value="获取验证码"/>
-                        </div>
-                        <div class="txt-group">
-                            <input type="checkbox" name="autoLogin"  value="1" checked />
-                            <span class="check-box yes" onclick="checkAutoLogin(this)">下次自动登录</span>
-                            <a class="txt-r" href="{{route('jkq.password.request')}}" >忘记密码?</a>
-                        </div>
+                            <div class="form-group mm">
+                                <div class="imgbg"></div>
+                                <input  class="input-login code" type="text"  value="" name="code" placeholder="请输入手机验证码"/>
+                                <input type="button"  class="btn-getcode" value="获取验证码"/>
+                            </div>
+                            <div class="txt-group">
+                                <input type="checkbox" name="autoLogin"  value="1" checked />
+                                <span class="check-box yes" onclick="checkAutoLogin(this)">下次自动登录</span>
+                                <a class="txt-r" href="{{route('jkq.password.request')}}" >忘记密码?</a>
+                            </div>
                             <div >
                                 <input class="btn-group login-mobile" type="button" value="登录">
                             </div>
@@ -87,7 +93,7 @@
                     </div>
 
                     <div class="reg-link-box">
-                            
+
                         还没有账号?<a class="reg-txt register_user" url="{{route('jkq.register.index')}}"  href="javascript:;" >立刻注册</a>
                     </div>
                 </div>
@@ -111,66 +117,170 @@
 
 
 @section('script')
-    <script type="text/javascript" src="{{theme_asset('app/js/jquery.disappear.tooltip.js ')}}"></script> 
-    
+    <script type="text/javascript" src="{{theme_asset('app/js/jquery.disappear.tooltip.js ')}}"></script>
+
     @include('module.widgets.thirdlogin')
     <script>
         $(function () {
-            var is_need_geetest=0;//全局,是否使用极验.
-            var login_type=1;//登录模式,1用户账号登录,2用户手机登录,3企业登录.
-            var gt_call_back=function(captchaObj) {
-                captchaObj.onReady(function () {
-                    //极验加载完成
-                });
-                captchaObj.onSuccess(function () {
-                    ajax_login(login_type,captchaObj);
+            // var is_need_geetest=0;//全局,是否使用极验.
+            // var login_type=1;//登录模式,1用户账号登录,2用户手机登录,3企业登录.
+            // var gt_call_back=function(captchaObj) {
+            //     captchaObj.onReady(function () {
+            //         //极验加载完成
+            //     });
+            //     captchaObj.onSuccess(function () {
+            //         ajax_login(login_type,captchaObj);
+            //
+            //     });
+            //     captchaObj.onError(function () {
+            //         show_error(login_type,"请先进行验证");
+            //     });
+            //     captchaObj.onClose(function () {
+            //         show_error(login_type,"请先进行验证");
+            //     });
+            //     $('.login-account').on('click', function () {
+            //         login_type=1;
+            //         //clean_message();
+            //         if (is_need_geetest==1){
+            //             captchaObj.bindForm("#form_account");
+            //             captchaObj.verify();
+            //         }
+            //         else{
+            //             ajax_login(login_type,captchaObj);
+            //         }
+            //
+            //     });
+            //
+            //     $('.login-mobile').on('click', function () {
+            //         login_type=2;
+            //         //clean_message();
+            //         if (is_need_geetest==1){
+            //             captchaObj.bindForm("#form_mobile");
+            //             captchaObj.verify();
+            //         }
+            //         else{
+            //             ajax_login(login_type,captchaObj);
+            //         }
+            //     });
+            //
+            //     $('.login-company').on('click', function () {
+            //         login_type=3;
+            //         //clean_message();
+            //         if (is_need_geetest==1){
+            //             captchaObj.bindForm("#form_company");
+            //             captchaObj.verify();
+            //         }
+            //         else{
+            //             ajax_login(login_type,captchaObj);
+            //         }
+            //     });
+            // };
+
+            var captcha_callback = function(res){
+                if(res.hasOwnProperty('errorMessage')){
+                    alert(res.errorMessage)
+                }
+                if(res.ret == 0){
+                    console.log('行为验证通过');
+
+                    $("#ticket").val(res.ticket);
+                    $("#bizState").val(res.bizState);
+                    $("#randstr").val(res.randstr);
+                    ajax_login(1);
+                }else{
+                    console.log('用户主动关闭验证码')
+                }
+                console.log('callback:', res);
+            }
 
-                });
-                captchaObj.onError(function () {
-                    show_error(login_type,"请先进行验证");
-                });
-                captchaObj.onClose(function () {
-                    show_error(login_type,"请先进行验证");
-                });
-                $('.login-account').on('click', function () {
-                    login_type=1;
-                    //clean_message();
-                    if (is_need_geetest==1){
-                        captchaObj.bindForm("#form_account");
-                        captchaObj.verify();
-                    }
-                    else{
-                        ajax_login(login_type,captchaObj);
-                    }
+            var mobile_captcha_flag = false;
+            var mobile_captcha_callback = function(res){
+                if(res.hasOwnProperty('errorMessage')){
+                    alert(res.errorMessage)
+                }
+                if(res.ret == 0){
+                    mobile_captcha_flag = true;
+                    console.log('行为验证通过');
+                    $("#ticket1").val(res.ticket);
+                    $("#bizState1").val(res.bizState);
+                    $("#randstr1").val(res.randstr);
+                    submit_data={
+                        "mobile":$("input[name='mobile']").val(),
+                        "type":"login",
+                        "ticket": res.ticket,
+                        "bizState": res.bizState,
+                        "randstr": res.randstr
+                    };
+                    $.ajax({
+                        method: 'post',
+                        url: '{{route('sms.send')}}',
+                        data: submit_data,
+                        beforeSend:function () {
+                            // console.log('请求开始');
+                            $(".errinfo").text("");
+                            $(".errinfo").removeClass("errinfo");
 
-                });
+                        },
+                        complete:function() {
+                            console.log('请求结束');
+                        },
+                        success: function (data) {
+                            // console.log(data);
+                            $("#message_mobile").addClass("successinfo");
+                            $("#message_mobile").text("发送成功,请注意查收");
+                            settime();
+                        },
+                        error: function (errorData) {
+                            // console.log(errorData);
+                            if (errorData.status==422) {//验证错误
+                                $.each(errorData.responseJSON.errors,function (key,val) {
+                                    $("#"+key).addClass("errinfo");
+                                    $("#"+key).text(val[0]);
+                                });
+                            }
+                            else if(errorData.status==400) {//业务错误
+                                $("#message_mobile").addClass("errinfo");
+                                $("#message_mobile").text(errorData.responseJSON.message);
+                            }
+                        }
+                    });
+                }else{
+                    console.log('用户主动关闭验证码')
+                }
+                console.log('callback:', res);
+            }
 
-                $('.login-mobile').on('click', function () {
-                    login_type=2;
-                    //clean_message();
-                    if (is_need_geetest==1){
-                        captchaObj.bindForm("#form_mobile");
-                        captchaObj.verify();
-                    }
-                    else{
-                        ajax_login(login_type,captchaObj);
-                    }
-                });
+            var captcha = new TencentCaptcha('196587903', captcha_callback, {});
+            $('.login-account').on('click', function () {
+                captcha.show();
 
-                $('.login-company').on('click', function () {
-                    login_type=3;
-                    //clean_message();
-                    if (is_need_geetest==1){
-                        captchaObj.bindForm("#form_company");
-                        captchaObj.verify();
-                    }
-                    else{
-                        ajax_login(login_type,captchaObj);
-                    }
-                });
-            };
+            });
 
-            gt_init(gt_call_back);//初始化极验
+            var mobile_captcha = new TencentCaptcha('196587903', mobile_captcha_callback, {});
+            $('.btn-getcode').on('click', function () {
+
+                var mobile = $("input[name='mobile']").val();
+                if(mobile == null || mobile == ''){
+                    $("#message_mobile").addClass("errinfo");
+                    $("#message_mobile").text("请输入手机号码");
+                    return false;
+                }
+                mobile_captcha.show();
+
+            });
+
+            $('.login-mobile').on('click', function () {
+                login_type=2;
+
+                if (mobile_captcha_flag){
+                    ajax_login(2);
+                }
+                else{
+                    alert('验证码组件异常')
+                }
+            });
+
+            //gt_init(gt_call_back);//初始化极验
 
             $(".input-login").keydown(function(ev){
                 ev = ev || window.event;
@@ -185,60 +295,23 @@
                 $(this).addClass("active").siblings("span").removeClass("active");
                 $(".login-type").eq(index).show().siblings(".login-type").hide();
             });
-            $('.btn-getcode').on('click', function () {
-                submit_data={
-                    "mobile":$("input[name='mobile']").val(),
-                    "type":"login"
-                };
-                $.ajax({
-                    method: 'post',
-                    url: '{{route('sms.send')}}',
-                    data: submit_data,
-                    beforeSend:function () {
-                       // console.log('请求开始');
-                        $(".errinfo").text("");
-                        $(".errinfo").removeClass("errinfo");
-
-                    },
-                    complete:function() {
-                        console.log('请求结束');
-                    },
-                    success: function (data) {
-                       // console.log(data);
-                        $("#message_mobile").addClass("successinfo");
-                        $("#message_mobile").text("发送成功,请注意查收");
-                        settime();
-                    },
-                    error: function (errorData) {
-                       // console.log(errorData);
-                        if (errorData.status==422) {//验证错误
-                            $.each(errorData.responseJSON.errors,function (key,val) {
-                                $("#"+key).addClass("errinfo");
-                                $("#"+key).text(val[0]);
-                            });
-                        }
-                        else if(errorData.status==400) {//业务错误
-                            $("#message_mobile").addClass("errinfo");
-                            $("#message_mobile").text(errorData.responseJSON.message);
-                        }
-                    }
-                });
-            });
+
 
             $(".register_user").click(function(){
-				 var url=$(this).attr("url")
+                var url=$(this).attr("url")
                 $.getJSON("{{route('jkq.register.status')}}", function (result) {
-                        
-                        if (result.status == 0) {
-                            disapperTooltip('remind', result.msg);
-                        } else{
-                            location.href=url;
-                        }
+
+                    if (result.status == 0) {
+                        disapperTooltip('remind', result.msg);
+                    } else{
+                        location.href=url;
+                    }
                 });
             })
 
 
-            function ajax_login(type, captchaObj) {
+            function ajax_login(type) {
+                console.log(type)
                 if (type==1) {
                     $.ajax({
                         method: 'post',
@@ -264,9 +337,7 @@
                             location.href=data.data.redirect_url;
                         },
                         error: function (errorData) {
-                            if (is_need_geetest==1){
-                                captchaObj.reset();
-                            }
+
                             if (errorData.status==422) {//验证错误
                                 $.each(errorData.responseJSON.errors,function (key,val) {
                                     $("#"+key).addClass("errinfo");
@@ -276,7 +347,6 @@
                             else if(errorData.status==400) {//业务错误
                                 $("#message_account").addClass("errinfo");
                                 $("#message_account").text(errorData.responseJSON.message);
-                                is_need_geetest=errorData.responseJSON.errors.is_need_geetest;
                             }
                         }
                     });

+ 136 - 209
public/themes/default/views/jkq/auth/login_company.blade.php

@@ -11,6 +11,7 @@
 @push('js')
     <script type="text/javascript" src="{{ theme_asset('gt/gt.js') }}"></script>
     <script type="text/javascript" src="{{ theme_asset('gt/gt.handle.js') }}"></script>
+    <script src="https://captcha.253.com/TCaptcha.js"></script>
 @endpush
 
 @section('content')
@@ -28,25 +29,28 @@
                     <div class="user-login">
                         <form id="form_company" action="{{route('jkq.login.company')}}" method="post">
                             {{ csrf_field() }}
+                            <input type="hidden" name="ticket" id="ticket">
+                            <input type="hidden" name="bizState" id="bizState">
+                            <input type="hidden" name="randstr" id="randstr">
                             <div id="company_account"></div>
                             <div id="message_company"></div>
-                        <div class="form-group yhm">
-                            <div class="imgbg"></div>
-                            <input class="input-login" type="text"  value="" name="company_account" placeholder="请输入用户名/手机/邮箱/统一社会信用码"/>
-                        </div>
+                            <div class="form-group yhm">
+                                <div class="imgbg"></div>
+                                <input class="input-login" type="text"  value="" name="company_account" placeholder="请输入用户名/手机/邮箱/统一社会信用码"/>
+                            </div>
                             <div id="company_password"></div>
-                        <div class="form-group mm">
-                            <div class="imgbg"></div>
-                            <input  class="input-login" type="password"  value="" name="company_password" placeholder="请输入密码"/>
-                        </div>
-                        <div class="txt-group">
-                            <input type="checkbox" name="autoLogin"  value="1" checked />
-                            <span class="check-box yes" onclick="checkAutoLogin(this)">下次自动登录</span>
-                            <a class="txt-r" href="{{route('jkq.password.request')}}" >忘记密码?</a>
-                        </div>
-                        <div >
-                            <input class="btn-group login-company" type="button" value="登录">
-                        </div>
+                            <div class="form-group mm">
+                                <div class="imgbg"></div>
+                                <input  class="input-login" type="password"  value="" name="company_password" placeholder="请输入密码"/>
+                            </div>
+                            <div class="txt-group">
+                                <input type="checkbox" name="autoLogin"  value="1" checked />
+                                <span class="check-box yes" onclick="checkAutoLogin(this)">下次自动登录</span>
+                                <a class="txt-r" href="{{route('jkq.password.request')}}" >忘记密码?</a>
+                            </div>
+                            <div >
+                                <input class="btn-group login-company" type="button" value="登录">
+                            </div>
                         </form>
                     </div>
 
@@ -76,74 +80,84 @@
     @include('module.widgets.thirdlogin')
     <script>
         $(function () {
-            var is_need_geetest=0;//全局,是否使用极验.
-            var login_type=1;//登录模式,1用户账号登录,2用户手机登录,3企业登录.
-            var gt_call_back=function(captchaObj) {
-                captchaObj.onReady(function () {
-                    //极验加载完成
-                });
-                captchaObj.onSuccess(function () {
-                    ajax_login(login_type,captchaObj);
-
-                });
-                captchaObj.onError(function () {
-                    show_error(login_type,"请先进行验证");
-                });
-                captchaObj.onClose(function () {
-                    show_error(login_type,"请先进行验证");
-                });
-                $('.login-account').on('click', function () {
-                    login_type=1;
-                    //clean_message();
-                    if (is_need_geetest==1){
-                        captchaObj.bindForm("#form_account");
-                        captchaObj.verify();
-                    }
-                    else{
-                        ajax_login(login_type,captchaObj);
-                    }
-
-                });
-
-                $('.login-mobile').on('click', function () {
-                    login_type=2;
-                    //clean_message();
-                    if (is_need_geetest==1){
-                        captchaObj.bindForm("#form_mobile");
-                        captchaObj.verify();
-                    }
-                    else{
-                        ajax_login(login_type,captchaObj);
-                    }
-                });
-
-                $('.login-company').on('click', function () {
-                    login_type=3;
-                    //clean_message();
-                    if (is_need_geetest==1){
-                        captchaObj.bindForm("#form_company");
-                        captchaObj.verify();
-                    }
-                    else{
-                        ajax_login(login_type,captchaObj);
-                    }
-                });
-            };
-
-            gt_init(gt_call_back);//初始化极验
-
-            $('.login-company').on('click', function () {
-                login_type=3;
-                //clean_message();
-                if (is_need_geetest==1){
-                    captchaObj.bindForm("#form_company");
-                    captchaObj.verify();
+            //var is_need_geetest=0;//全局,是否使用极验.
+            //var login_type=1;//登录模式,1用户账号登录,2用户手机登录,3企业登录.
+            // var gt_call_back=function(captchaObj) {
+            //     captchaObj.onReady(function () {
+            //         //极验加载完成
+            //     });
+            //     captchaObj.onSuccess(function () {
+            //         ajax_login(login_type,captchaObj);
+            //
+            //     });
+            //     captchaObj.onError(function () {
+            //         show_error(login_type,"请先进行验证");
+            //     });
+            //     captchaObj.onClose(function () {
+            //         show_error(login_type,"请先进行验证");
+            //     });
+            //     $('.login-account').on('click', function () {
+            //         login_type=1;
+            //         //clean_message();
+            //         if (is_need_geetest==1){
+            //             captchaObj.bindForm("#form_account");
+            //             captchaObj.verify();
+            //         }
+            //         else{
+            //             ajax_login(login_type,captchaObj);
+            //         }
+            //
+            //     });
+            //
+            //     $('.login-mobile').on('click', function () {
+            //         login_type=2;
+            //         //clean_message();
+            //         if (is_need_geetest==1){
+            //             captchaObj.bindForm("#form_mobile");
+            //             captchaObj.verify();
+            //         }
+            //         else{
+            //             ajax_login(login_type,captchaObj);
+            //         }
+            //     });
+            //
+            //     $('.login-company').on('click', function () {
+            //         login_type=3;
+            //         //clean_message();
+            //         if (is_need_geetest==1){
+            //             captchaObj.bindForm("#form_company");
+            //             captchaObj.verify();
+            //         }
+            //         else{
+            //             ajax_login(login_type,captchaObj);
+            //         }
+            //     });
+            // };
+            //
+            // gt_init(gt_call_back);//初始化极验
+
+            var captcha_callback = function(res){
+                if(res.hasOwnProperty('errorMessage')){
+                    alert(res.errorMessage)
                 }
-                else{
-                    ajax_login(login_type,captchaObj);
+                if(res.ret == 0){
+                    console.log('行为验证通过');
+                    $("#ticket").val(res.ticket);
+                    $("#bizState").val(res.bizState);
+                    $("#randstr").val(res.randstr);
+                    ajax_login();
+                }else{
+                    console.log('用户主动关闭验证码')
                 }
+                console.log('callback:', res);
+            }
+
+            var captcha = new TencentCaptcha('196587903', captcha_callback, {});
+            $('.login-company').on('click', function () {
+                captcha.show();
             });
 
+
             $(".input-login").keydown(function(ev){
                 ev = ev || window.event;
                 var code = (ev.keyCode || ev.which);
@@ -167,7 +181,7 @@
                     url: '{{route('sms.send')}}',
                     data: submit_data,
                     beforeSend:function () {
-                       // console.log('请求开始');
+                        // console.log('请求开始');
                         $(".errinfo").text("");
                         $(".errinfo").removeClass("errinfo");
 
@@ -176,13 +190,13 @@
                         console.log('请求结束');
                     },
                     success: function (data) {
-                       // console.log(data);
+                        // console.log(data);
                         $("#message_mobile").addClass("successinfo");
                         $("#message_mobile").text("发送成功,请注意查收");
                         settime();
                     },
                     error: function (errorData) {
-                       // console.log(errorData);
+                        // console.log(errorData);
                         if (errorData.status==422) {//验证错误
                             $.each(errorData.responseJSON.errors,function (key,val) {
                                 $("#"+key).addClass("errinfo");
@@ -198,134 +212,47 @@
             });
 
 
-            function ajax_login(type, captchaObj) {
-                if (type==1) {
-                    $.ajax({
-                        method: 'post',
-                        url: $("#form_account").attr('action'),
-                        data: $("#form_account").serialize(),
-                        beforeSend:function () {
-                            //console.log('请求开始');
-                            clean_message();
-                            $('.login-account').addClass("btn-disabled").prop('disabled', true);
-                            $('.login-account').val("登录中...");
-
-                        },
-                        complete:function() {
-                            //console.log('请求结束');
-                            $('.login-account').val("登录");
-                            $('.login-account').removeClass("btn-disabled").prop('disabled', false);
-
-                        },
-                        success: function (data) {
-                            //console.log(data);
-                            $("#message_account").addClass("successinfo");
-                            $("#message_account").text("登录成功, 正在跳转...");
-                            location.href=data.data.redirect_url;
-                        },
-                        error: function (errorData) {
-                            if (is_need_geetest==1){
-                                captchaObj.reset();
-                            }
-                            if (errorData.status==422) {//验证错误
-                                $.each(errorData.responseJSON.errors,function (key,val) {
-                                    $("#"+key).addClass("errinfo");
-                                    $("#"+key).text(val[0]);
-                                });
-                            }
-                            else if(errorData.status==400) {//业务错误
-                                $("#message_account").addClass("errinfo");
-                                $("#message_account").text(errorData.responseJSON.message);
-                                is_need_geetest=errorData.responseJSON.errors.is_need_geetest;
-                            }
-                        }
-                    });
-                }
-                else if (type==2) {
-                    $.ajax({
-                        method: 'post',
-                        url: $("#form_mobile").attr('action'),
-                        data: $("#form_mobile").serialize(),
-                        beforeSend:function () {
-                            //console.log('请求开始');
-                            clean_message();
-                            $('.login-mobile').addClass("btn-disabled").prop('disabled', true);
-                            $('.login-mobile').val("登录中...");
-
-                        },
-                        complete:function() {
-                            //console.log('请求结束');
-                            $('.login-mobile').val("登录");
-                            $('.login-mobile').removeClass("btn-disabled").prop('disabled', false);
-                        },
-                        success: function (data) {
-                            //console.log(data);
-                            $("#message_mobile").addClass("successinfo");
-                            $("#message_mobile").text("登录成功, 正在跳转...");
-                            location.href=data.data.redirect_url;
-                        },
-                        error: function (errorData) {
-                            //console.log(errorData);
-                            if (is_need_geetest==1){
-                                captchaObj.reset();
-                            }
-                            if (errorData.status==422) {//验证错误
-                                $.each(errorData.responseJSON.errors,function (key,val) {
-                                    $("#"+key).addClass("errinfo");
-                                    $("#"+key).text(val[0]);
-                                });
-                            }
-                            else if(errorData.status==400) {//业务错误
-                                $("#message_mobile").addClass("errinfo");
-                                $("#message_mobile").text(errorData.responseJSON.message);
-                                is_need_geetest=errorData.responseJSON.errors.is_need_geetest;
-                            }
+            function ajax_login(type) {
+
+                $.ajax({
+                    method: 'post',
+                    url: $("#form_company").attr('action'),
+                    data: $("#form_company").serialize(),
+                    beforeSend:function () {
+                        //console.log('请求开始');
+                        clean_message();
+                        $('.login-company').addClass("btn-disabled").prop('disabled', true);
+                        $('.login-company').val("登录中...");
+
+                    },
+                    complete:function() {
+                        //console.log('请求结束');
+                        $('.login-company').val("登录");
+                        $('.login-company').removeClass("btn-disabled").prop('disabled', false);
+
+                    },
+                    success: function (data) {
+                        //console.log(data);
+                        $("#message_company").addClass("successinfo");
+                        $("#message_company").text("登录成功, 正在跳转...");
+                        location.href=data.data.redirect_url;
+                    },
+                    error: function (errorData) {
+                        //console.log(errorData);
+
+                        if (errorData.status==422) {//验证错误
+                            $.each(errorData.responseJSON.errors,function (key,val) {
+                                $("#"+key).addClass("errinfo");
+                                $("#"+key).text(val[0]);
+                            });
                         }
-                    });
-                }
-                else if (type==3){
-                    $.ajax({
-                        method: 'post',
-                        url: $("#form_company").attr('action'),
-                        data: $("#form_company").serialize(),
-                        beforeSend:function () {
-                            //console.log('请求开始');
-                            clean_message();
-                            $('.login-company').addClass("btn-disabled").prop('disabled', true);
-                            $('.login-company').val("登录中...");
-
-                        },
-                        complete:function() {
-                            //console.log('请求结束');
-                            $('.login-company').val("登录");
-                            $('.login-company').removeClass("btn-disabled").prop('disabled', false);
-
-                        },
-                        success: function (data) {
-                            //console.log(data);
-                            $("#message_company").addClass("successinfo");
-                            $("#message_company").text("登录成功, 正在跳转...");
-                            location.href=data.data.redirect_url;
-                        },
-                        error: function (errorData) {
-                            //console.log(errorData);
-                            if (is_need_geetest==1){
-                                captchaObj.reset();
-                            }
-                            if (errorData.status==422) {//验证错误
-                                $.each(errorData.responseJSON.errors,function (key,val) {
-                                    $("#"+key).addClass("errinfo");
-                                    $("#"+key).text(val[0]);
-                                });
-                            }
-                            else if(errorData.status==400) {//业务错误
-                                $("#message_company").addClass("errinfo");
-                                $("#message_company").text(errorData.responseJSON.message);
-                                is_need_geetest=errorData.responseJSON.errors.is_need_geetest;
-                            }
+                        else if(errorData.status==400) {//业务错误
+                            $("#message_company").addClass("errinfo");
+                            $("#message_company").text(errorData.responseJSON.message);
                         }
-                    });
-                }
+                    }
+                });
+
             };
 
             function show_error(type,message) {

+ 126 - 37
public/themes/default/views/jkq/auth/password_request.blade.php

@@ -10,8 +10,8 @@
 @endpush
 
 @push('js')
-    <script type="text/javascript" src="{{ theme_asset('gt/gt.js') }}"></script>
-    <script type="text/javascript" src="{{ theme_asset('gt/gt.handle.js') }}"></script>
+    {{--<script type="text/javascript" src="{{ theme_asset('gt/gt.js') }}"></script>--}}
+    {{--    <script type="text/javascript" src="{{ theme_asset('gt/gt.handle.js') }}"></script>--}}
     <script type="text/javascript" src="{{ theme_asset('jquery/jquery.min.js') }}"></script>
 @endpush
 
@@ -54,7 +54,7 @@
             </div>
             <div class="clear"></div>
             <div class="mobileshow J_listitme_group">
-                <form id="getPassByMobileForm" action="{{route('jkq.password.request')}}" method="post" onkeydown="if(event.keyCode==13){return false;}">
+                <form id="getPassByMobileForm" action="{{route('password.request')}}" method="post" onkeydown="if(event.keyCode==13){return false;}">
                     <div class="selecttip">系统将发送验证码短信到您的手机上,请注意查收</div>
                     <div class="J_validate_group">
                         <div class="td1">
@@ -78,6 +78,7 @@
                         <div class="clear"></div>
                     </div>
                     <div class="btnbox">
+
                         <input class="utype" type="hidden" name="utype" value="1">
                         <input type="hidden" name="type" value="mobile">
                         {{csrf_field()}}
@@ -86,7 +87,7 @@
                 </form>
             </div>
             <div class="emailshow J_listitme_group">
-                <form id="getPassByEmailForm" action="{{route('jkq.password.request')}}" method="post" onkeydown="if(event.keyCode==13){return false;}">
+                <form id="getPassByEmailForm" action="{{route('password.request')}}" method="post" onkeydown="if(event.keyCode==13){return false;}">
                     <div class="selecttip">系统将发出一封验证邮件到您的注册(或绑定的)邮箱,<br>通过验证邮件就可以重新设置密码了</div>
                     <div class="J_validate_group">
                         <div class="td1">
@@ -96,6 +97,9 @@
                         <div class="clear"></div>
                     </div>
                     <div class="btnbox">
+                        <input type="hidden" name="ticket" id="ticket">
+                        <input type="hidden" name="bizState" id="bizState">
+                        <input type="hidden" name="randstr" id="randstr">
                         <input class="utype" type="hidden" name="utype" value="1">
                         <input type="hidden" name="type" value="email">
                         {{csrf_field()}}
@@ -104,7 +108,7 @@
                 </form>
             </div>
             <div class="bottom_appeal_tip link_blue"><strong>上面的方式都不可用?</strong><br>
-                你还可以进行 <a href="{{route('jkq.appeal')}}">账号申诉</a> 或 电话联系我们 <span class="font_blue">{{config('aix.system.site.site.bootom_tel')}}</span>
+                你还可以进行 <a href="{{route('appeal')}}">账号申诉</a> 或 电话联系我们 <span class="font_blue">{{config('aix.system.site.site.bootom_tel')}}</span>
             </div>
         </div>
     </div>
@@ -126,11 +130,65 @@
             root:""
         }
         var check_url="/auth/register/check/";
-        var register_url="{{route('jkq.register.person')}}";
-        var login_url="{{route('jkq.login')}}";
+        var register_url="{{route('register.person')}}";
+        var login_url="{{route('login')}}";
         var sms_url="{{route('sms.send')}}";
         var find_type=1;
         var captcha_open ={{config('aix.system.site_safety.site_vo_code.captcha_open', 0) }};
+
+        var captcha_callback = function(res){
+            if(res.hasOwnProperty('errorMessage')){
+                alert(res.errorMessage)
+            }
+            if(res.ret == 0){
+                console.log('行为验证通过');
+
+                $("#ticket_mobile").val(res.ticket);
+                $("#bizState_mobile").val(res.bizState);
+                $("#randstr_mobile").val(res.randstr);
+                toSetSms(res);
+            }else{
+                console.log('用户主动关闭验证码')
+            }
+            console.log('callback:', res);
+        };
+
+        var captcha_callback_email = function(res){
+            if(res.hasOwnProperty('errorMessage')){
+                alert(res.errorMessage)
+            }
+            if(res.ret == 0){
+
+
+                $("#ticket").val(res.ticket);
+                $("#bizState").val(res.bizState);
+                $("#randstr").val(res.randstr);
+                $.ajax({
+                    url: '{{route('password.request')}}',
+                    cache: false,
+                    async: false,
+                    type: 'post',
+                    dataType: 'json',
+                    data: $('#getPassByEmailForm').serialize(),
+                    success: function(json) {
+                        disapperTooltip("success", "邮件发送成功,请前往邮箱操作!");
+
+                    },
+                    error:function(data){
+                        disapperTooltip("remind", data.message);
+                        $('#email').focus();
+                        return false;
+                    }
+                });
+            }else{
+                console.log('用户主动关闭验证码')
+            }
+            console.log('callback:', res);
+        };
+
+        var captcha = new TencentCaptcha('196587903', captcha_callback, {});
+        var captcha_email = new TencentCaptcha('196587903', captcha_callback_email, {});
+
         //找回用户类型
         $('.find_type').click(function(event) {
             var indexValue = $('.find_type').index(this);
@@ -138,12 +196,12 @@
             $('.utype').val(find_type);
             console.log(find_type);
         });
-        @if(request('utype')=="user"){
+            @if(request('utype')=="user"){
             $("#wl_user").click();
         }
 
         @endif
-        
+
 
         // 找回方式切换
         $('.find_way').click(function(event) {
@@ -151,6 +209,27 @@
             $('.J_listitme_group').eq(indexValue).show().siblings('.J_listitme_group').hide();
         });
 
+        $('#getPassByEmailForm').on('submit', function(event) {
+            event.preventDefault();
+            var emailValue = $.trim($('#email').val());
+            if (emailValue == '') {
+                disapperTooltip("remind", "请输入邮箱");
+                $('#email').focus();
+                return false;
+            };
+            if (emailValue != "" && !regularEmail.test(emailValue)) {
+                disapperTooltip("remind", "请输入正确的邮箱");
+                $('#email').focus();
+                return false;
+            }
+            captcha_email.show();
+        });
+
+        // $("#email_reset").click(function (event){
+        //     event.preventDefault();
+        //
+        // })
+
         // 点击获取验证码先判断是否输入了手机号
         $('#J_getverificode').click(function() {
             var mobileValue = $.trim($('#mobile').val());
@@ -179,18 +258,15 @@
                 error:function(data){
                     var error_obj=eval('(' + data.responseText + ')');
                     if(data.status==400) {//业务错误
-                        if (captcha_open) {
-                            $("#btnCheck").click();
-                        } else {
-                            toSetSms({});
-                        }
+                        captcha.show();
+
                     }
                 }
             });
         });
 
         // 发送手机验证码
-        function toSetSms(geet_result) {
+        function toSetSms(result) {
             function settime(countdown) {
                 if (countdown == 0) {
                     $('#J_getverificode').prop("disabled", 0);
@@ -211,13 +287,13 @@
             $('#J_getverificode').prop("disabled", !0);
             $('#J_getverificode').addClass('btn_disabled');
             $('#J_getverificode').val('发送中...');
-            geet_result.mobile= $.trim($('#mobile').val());
-            geet_result.type= "check";
+            result.mobile= $.trim($('#mobile').val());
+            result.type= "check";
             $.ajax({
                 url: sms_url,
                 type: 'POST',
                 dataType: 'json',
-                data: geet_result,
+                data: result,
                 success: function (data) {
                     // console.log(data);
                     setTimeout(function() {
@@ -238,26 +314,39 @@
                 }
             });
         }
-        if (captcha_open) {
-            //发送短信
-            var handler = function(captchaObj) {
-                captchaObj.appendTo("#popup-captcha");
-                captchaObj.onSuccess(function() {
-                    var result = captchaObj.getValidate();
-                    toSetSms(result);
-                });
-
-                captchaObj.onError(function() {
 
-                });
-                $('#btnCheck').on('click', function () {
-                    captchaObj.verify();
-
-                });
-            };
-            gt_init(handler);
-        }
+    </script>
+    <script>
+        $('#mobile_reset').click(function(){
+            $('#mobile_reset').val('处理中...').addClass('btn_disabled').prop('disabled', !0);
+            $.ajax({
+                url: $('#getPassByMobileForm').action,
+                type: 'POST',
+                dataType: 'json',
+                data: $('#getPassByMobileForm').serialize(),
+                success: function (data) {
+                    //disapperTooltip("success","注册成功,正在为你跳转..");
+                    setTimeout(function () {
+                        window.location.href = data.data.url;
+                    }, 1000)
 
+                },
+                error: function (data) {
+                    var error_obj = eval('(' + data.responseText + ')');
+                    $('#mobile_reset').val('下一步').removeClass('btn_disabled').prop('disabled', 0);
+                    if (data.status == 422) {//验证错误
+                        $.each(error_obj.errors, function (key, val) {
+                            disapperTooltip("remind", val[0]);
+                            return;
+                        });
+                    }
+                    else if (data.status == 400) {//业务错误
+                        disapperTooltip("remind", error_obj.message);
+                    }
+                }
+            });
+            return false;
+        });
     </script>
-    <script type="text/javascript" src="{{ theme_asset('app/js/members/jquery.validate.getpass.js') }}"></script>
+    {{--<script type="text/javascript" src="{{ theme_asset('app/js/members/jquery.validate.getpass.js') }}"></script>--}}
 @endsection

+ 55 - 55
public/themes/default/views/jkq/auth/register.blade.php

@@ -5,75 +5,75 @@
 @endpush
 
 @push('css')
-    <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">
+	<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">
 @endpush
 
 @push('js')
 @endpush
 
 @section('content')
-<div class="reg_box">
-    <div class="reg_select">
-    	<div class="reg_select_lf">
-	        <div class="slogo">
-	        	<a href="{{route('jkq.home')}}"><img src="{{upload_asset(subsite_config('aix.system.site.site.logo'))}}" alt="logo"/></a>
-	        </div>
-	         <div class="tit"><span>请选择注册类型 </span> </div>
-	        <div class="sbox">
-	            <div class="slisit1 J_hoverbut register_user" url="{{route('jkq.register.company')}}" >
-	            	<div class="sicon1"></div>
-	                <div class="stitle">企业注册</div>
-	                <div class="stxt">
-	                    <span>发布招聘信息</span><br>
-	                    <span>收取简历投递</span><br>
-	                    <span>多种职位分享</span>
-	                </div>
-	            </div>
-	            <!--<div class="slisitc">&nbsp;</div>-->
-	            <div class="slisit2 J_hoverbut register_user" url="{{route('jkq.register.person')}}" >
-	                <div class="sicon2"></div>
-	                <div class="stitle">个人注册</div>
-	                <div class="stxt">
-	                    <span>免费创简历</span><br>
-	                    <span>职位海量淘</span><br>
-	                    <span>简历轻松投</span><br>
-	                </div>
-	            </div>
-	            <div class="clear"></div>
-	        </div>
-	        <div class="sfooter">
-				<div class="sf1">
-					<span>已有账号?</span>
-					<a href="{{route('jkq.login')}}">点击登录</a>
+	<div class="reg_box">
+		<div class="reg_select">
+			<div class="reg_select_lf">
+				<div class="slogo">
+					<a href="{{route('jkq.home')}}"><img src="{{upload_asset(subsite_config('aix.system.site.site.logo'))}}" alt="logo"/></a>
 				</div>
-				<div class="sf2">
-					<a href="{{route('jkq.home')}}">返回首页</a>
+				<div class="tit"><span>请选择注册类型 </span> </div>
+				<div class="sbox">
+					<div class="slisit1 J_hoverbut register_user" url="{{route('jkq.register.company')}}" >
+						<div class="sicon1"></div>
+						<div class="stitle">企业注册</div>
+						<div class="stxt">
+							<span>发布招聘信息</span><br>
+							<span>收取简历投递</span><br>
+							<span>多种职位分享</span>
+						</div>
+					</div>
+					<!--<div class="slisitc">&nbsp;</div>-->
+					<div class="slisit2 J_hoverbut register_user" url="{{route('jkq.register.person')}}" >
+						<div class="sicon2"></div>
+						<div class="stitle">个人注册</div>
+						<div class="stxt">
+							<span>免费创简历</span><br>
+							<span>职位海量淘</span><br>
+							<span>简历轻松投</span><br>
+						</div>
+					</div>
+					<div class="clear"></div>
+				</div>
+				<div class="sfooter">
+					<div class="sf1">
+						<span>已有账号?</span>
+						<a href="{{route('jkq.login')}}">点击登录</a>
+					</div>
+					<div class="sf2">
+						<a href="{{route('jkq.home')}}">返回首页</a>
+					</div>
 				</div>
 			</div>
-        </div>
-        <div  class="reg_select_rt"></div>
-        <div class="clear"></div>
-    </div>
-</div>
+			<div  class="reg_select_rt"></div>
+			<div class="clear"></div>
+		</div>
+	</div>
 @endsection
 
 
 @section('script')
 	<script src="{{ theme_asset('app/js/members/jquery.common.js') }}"></script>
-	<script type="text/javascript" src="{{theme_asset('app/js/jquery.disappear.tooltip.js ')}}"></script> 
+	<script type="text/javascript" src="{{theme_asset('app/js/jquery.disappear.tooltip.js ')}}"></script>
 	<script>
-		     $(".register_user").click(function(){
-				 var url=$(this).attr("url")
-                $.getJSON("{{route('jkq.register.status')}}", function (result) {
-                        
-                        if (result.status == 0) {
-                            disapperTooltip('remind', result.msg);
-                        } else{
-                            location.href=url;
-                        }
-                });
-            })
+		$(".register_user").click(function(){
+			var url=$(this).attr("url")
+			$.getJSON("{{route('jkq.register.status')}}", function (result) {
+
+				if (result.status == 0) {
+					disapperTooltip('remind', result.msg);
+				} else{
+					location.href=url;
+				}
+			});
+		})
 	</script>
 @endsection

+ 24 - 8
public/themes/default/views/jkq/auth/register_company.blade.php

@@ -22,9 +22,9 @@
             {{--<input type="hidden" name="incode" value="">--}}
             {{csrf_field()}}
             <div class="rl J_focus">
-            	<div class="slogo">
-            		<a href="{{route('jkq.home')}}"><img src="{{upload_asset(subsite_config('aix.system.site.site.logo'))}}" alt="logo"/></a>
-            	</div>
+                <div class="slogo">
+                    <a href="{{route('jkq.home')}}"><img src="{{upload_asset(subsite_config('aix.system.site.site.logo'))}}" alt="logo"/></a>
+                </div>
                 <div class="switch_title link_blue"><a href="{{route('jkq.register.person')}}">点击切换为个人注册&gt;&gt;</a></div>
                 <div class="regicon">企业注册</div>
                 <div class="regtit">企业信息</div>
@@ -34,12 +34,26 @@
                     </div>
                     <div class="td2 J_showtip_box"><div for="companyname" generated="true" class="tip" style="display: none;"><div class="ftxt">名称与企业营业执照保持一致</div><div class="fimg"></div></div></div>
                 </div>
+                <div class="J_validate_group">
+                    <div class="td1" >
+                        <select name="company_type" id="member_status_mobile" style="border:1px #DDDDDD solid;width:295px;height:42px;padding-left:30px;font-family: microsoft yahei,宋体;font-size: 14px;color: #666666;">
+                            <option value="0" selected="selected">────&nbsp;请选择企业/单位类型&nbsp;────</option>
+                            <option value="1" >────&nbsp;现代产业体系企业&nbsp;────</option>
+                            <option value="2" >────&nbsp;集成电路体系企业&nbsp;────</option>
+                            <option value="3" >────&nbsp;卫生健康单位&nbsp;────</option>
+                            <option value="4" >────&nbsp;高等教育学校&nbsp;────</option>
+                        </select>
+                    </div>
+                    <div class="td2 J_showtip_box"></div>
+                    <div class="clear"></div>
+                </div>
                 <div class="J_validate_group">
                     <div class="td1">
                         <input class="input_295_34" name="contact" id="contact" type="text" placeholder="请输入企业联系人" autocomplete="off">
                     </div>
                     <div class="td2 J_showtip_box"></div>
                 </div>
+
                 <div class="J_validate_group">
                     <div class="td1">
                         <div class="tel_td1">
@@ -111,16 +125,18 @@
             <!-- -->
 
             <div class="rr">
-            	<a href="{{route('jkq.home')}}" class="gohome">返回首页</a>
-                <div id="thirdlogin-wechat-web" class="webchat-login-code"></div>
+                <a href="{{route('jkq.home')}}" class="gohome">返回首页</a>
+                {{--<div id="thirdlogin-wechat-web" class="webchat-login-code"></div>--}}
+                <div id="thirdlogin-wechat-web" class="webchat-login-code"><img src="{{upload_asset($qrcode)}}"/></div>
                 <div id="other-thirdlogin" class="loginappimg">
-                    <p class="txt">使用合作账号直接登录</p>
+                    {{--<p class="txt">使用合作账号直接登录</p>--}}
+                    <p class="txt">可添加工作人员微信了解更多讯息</p>
                 </div>
                 <div class="tittxt">已经有{{subsite_config('aix.system.site.site.site_name')}}账号:
-                	<div class="logintxt"><a href="{{route('jkq.login.company')}}" class="J_hoverbut btn_blue btn_inline">直接登录</a></div>
+                    <div class="logintxt"><a href="{{route('jkq.login.company')}}" class="J_hoverbut btn_blue btn_inline">直接登录</a></div>
                 </div>
 
-        	</div>
+            </div>
             <!-- -->
             <div class="clear"></div>
             <div id="popupCaptcha"></div>

+ 402 - 164
public/themes/default/views/jkq/auth/register_person.blade.php

@@ -8,200 +8,263 @@
     <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')
-    <script type="text/javascript" src="{{ theme_asset('gt/gt.js') }}"></script>
-    <script type="text/javascript" src="{{ theme_asset('gt/gt.handle.js') }}"></script>
+    {{--    <script type="text/javascript" src="{{ theme_asset('gt/gt.js') }}"></script>--}}
+    {{--    <script type="text/javascript" src="{{ theme_asset('gt/gt.handle.js') }}"></script>--}}
     <script type="text/javascript" src="{{ theme_asset('jquery/jquery.min.js') }}"></script>
-
+    {{--<script type="text/javascript" src="{{ theme_asset('app/js/pad/qsToast.js') }}"></script>--}}
+    <script>
+        function qsToast(data) {
+            alert(data.context);
+        }
+    </script>
 @endpush
 
 @section('content')
-<div class="reg_per_box">
-    <div class="reg_per">
-        <div class="rl J_focus">
-        	<div class="slogo">
-        		<a href="{{route('jkq.home')}}"><img src="{{upload_asset(subsite_config('aix.system.site.site.logo'))}}" alt="logo"/></a>
-        	</div>
-            <div class="switch_title link_blue"><a href="{{route('jkq.register.company')}}">切换为企业注册&gt;&gt;</a></div>
-            <div class="regicon">个人注册</div>
-            <div class="regtab">
-{{--                <div class="tabli t1 select"><div class="v">手机注册</div></div>--}}
-                <div class="tabli t2 select"><div class="v">邮箱注册</div></div>
-                <!--<div id="J_weixinReg" class="tabli t3"><div class="v">微信注册</div></div>-->
+    <div class="reg_per_box">
+        <div class="reg_per">
+            <div class="rl J_focus">
+                <div class="slogo">
+                    <a href="{{route('jkq.home')}}"><img src="{{upload_asset(subsite_config('aix.system.site.site.logo'))}}" alt="logo"/></a>
+                </div>
+                <div class="switch_title link_blue"><a href="{{route('jkq.register.company')}}">切换为企业注册&gt;&gt;</a></div>
+                <div class="regicon">个人注册</div>
+                <div class="regtab">
+                    <div class="tabli t1 select"><div class="v">手机注册</div></div>
+                    <div class="tabli t2"><div class="v">邮箱注册</div></div>
+                    <!--<div id="J_weixinReg" class="tabli t3"><div class="v">微信注册</div></div>-->
+                    <div class="clear"></div>
+                </div>
                 <div class="clear"></div>
-            </div>
-            <div class="clear"></div>
-            <!-- 手机注册-->
-            <div class="tabshow" style="display:none">
-                <form class="J_passwordalert_group" id="regMobileForm" action="" method="post" onkeydown="if(event.keyCode==13){return false;}">
-                    {{--<input type="hidden" name="incode" value="">--}}
-                    {{csrf_field()}}
-                    <input type="hidden" name="reg_source" value="1">
-
-                    <div class="J_validate_group">
-                        <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>
-                        <div class="clear"></div>
-                    </div>
+                <!-- 手机注册-->
+                <div class="tabshow" style="display:block;">
+                    <form class="J_passwordalert_group" id="regMobileForm" action="" method="post" onkeydown="if(event.keyCode==13){return false;}">
+                        {{--<input type="hidden" name="incode" value="">--}}
+                        {{csrf_field()}}
+                        <input type="hidden" name="reg_type" value="1">
+                        <input type="hidden" name="reg_source" value="2" />
+                        {{--<div class="J_validate_group">
+                            <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>
+                            <div class="clear"></div>
+                        </div>--}}
 
 
-                    <div class="J_validate_group">
-                        <div class="td1">
-                            <input class="input_295_34" name="mobile" id="mobile" type="text" placeholder="请输入手机号码" autocomplete="off">
+                        <div class="J_validate_group">
+                            <div class="td1">
+                                <input class="input_295_34" name="mobile" id="mobile" type="text" placeholder="请输入手机号码" autocomplete="off">
+                            </div>
+                            <div class="td2 J_showtip_box"><div for="mobile" generated="true" class="tip" style="display: none;"><div class="ftxt">手机号可用于登录网站和找回密码</div><div class="fimg"></div></div></div>
+                            <div class="clear"></div>
                         </div>
-                        <div class="td2 J_showtip_box"><div for="mobile" 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 had-remind">
-                        <div class="radio_list fl J_radioitme_parent">
-                            <!-- <div class="rli J_radioitme" data-code="1" style="width: 480px;float: none;margin-bottom: 5px;">解绑手机号<span style="color: #FF0000;">(该手机号已被其它账号绑定,选择此项将会解除其它账号绑定)</span></div> -->
-                            <div class="rli J_radioitme checked" data-code="1" style="width: 480px;float: none;margin-bottom: 5px;"><span style="color: #FF0000;">(该手机号已被其它账号绑定)</span></div>
-                            <div class="rli J_radioitme" data-code="2" style="width: 80px;float: none;margin-bottom: 5px;" id="J_change_mobile">更换手机号</div>
-                            <div class="rli J_radioitme" data-code="3" style="width: 100px;float: none;" id="J_login">用此手机号登录</div>
-                            <input class="J_radioitme_code" name="unbind_mobile" id="unbind_mobile" type="hidden" value="0">
+                        <div class="J_validate_group had-remind">
+                            <div class="radio_list fl J_radioitme_parent">
+                                <!-- <div class="rli J_radioitme" data-code="1" style="width: 480px;float: none;margin-bottom: 5px;">解绑手机号<span style="color: #FF0000;">(该手机号已被其它账号绑定,选择此项将会解除其它账号绑定)</span></div> -->
+                                <div class="rli J_radioitme checked" data-code="1" style="width: 480px;float: none;margin-bottom: 5px;"><span style="color: #FF0000;">(该手机号已被其它账号绑定)</span></div>
+                                <div class="rli J_radioitme" data-code="2" style="width: 80px;float: none;margin-bottom: 5px;" id="J_change_mobile">更换手机号</div>
+                                <div class="rli J_radioitme" data-code="3" style="width: 100px;float: none;" id="J_login">用此手机号登录</div>
+                                <input class="J_radioitme_code" name="unbind_mobile" id="unbind_mobile" type="hidden" value="0">
+                            </div>
                         </div>
-                    </div>
-                    <div class="J_validate_group">
-                        <div class="td1">
-                            <div class="code">
-                                <input class="input_295_34" name="mobile_vcode" id="mobile_vcode" type="text" placeholder="请输入短信验证码" autocomplete="off">
+                        <div class="J_validate_group">
+                            <div class="td1">
+                                <div class="code">
+                                    <input class="input_295_34" name="mobile_vcode" id="mobile_vcode" type="text" placeholder="请输入短信验证码" autocomplete="off">
+                                </div>
+                                <div class="codebtn">
+                                    <div type="button" class="btn_yellow J_hoverbut" id="getVerfyCode">获取验证码</div>
+                                    <input type="hidden" id="origin_btnCheck" style="display: none;"><input type="hidden" id="btnCheck">
+                                </div>
+                                <div class="clear"></div>
                             </div>
-                            <div class="codebtn">
-                                <input type="button" class="btn_yellow J_hoverbut" id="J_getverificode" value="获取验证码">
-                                <input type="hidden" id="origin_btnCheck" style="display: none;"><input type="hidden" id="btnCheck">
+                            <div class="td2 J_showtip_box"></div>
+                            <div class="clear"></div>
+                        </div>
+                        <div class="J_validate_group">
+                            <div class="td1">
+                                <input class="input_295_34 J_passwordalert" name="password" id="password" type="password" placeholder="请输入账户密码" autocomplete="off">
                             </div>
+                            <div class="td2 J_showtip_box"></div>
                             <div class="clear"></div>
                         </div>
-                        <div class="td2 J_showtip_box"></div>
-                        <div class="clear"></div>
-                    </div>
-                    <div class="J_validate_group">
-                        <div class="td1">
-                            <input class="input_295_34 J_passwordalert" name="password" id="password" type="password" placeholder="请输入账户密码" autocomplete="off">
+                        <div class="safety">
+                            <div class="slist t1">危险</div>
+                            <div class="slist t2">一般</div>
+                            <div class="slist t3">安全</div>
+                            <div class="clear"></div>
                         </div>
-                        <div class="td2 J_showtip_box"></div>
-                        <div class="clear"></div>
-                    </div>
-                    <div class="safety">
-                        <div class="slist t1">危险</div>
-                        <div class="slist t2">一般</div>
-                        <div class="slist t3">安全</div>
-                        <div class="clear"></div>
-                    </div>
-                    <div class="J_validate_group">
-                        <div class="td1">
-                            <input name="password_confirmation" type="password" class="input_295_34" placeholder="请确认账户密码" autocomplete="off">
+                        <div class="J_validate_group">
+                            <div class="td1">
+                                <input name="password_confirmation" type="password" class="input_295_34" placeholder="请确认账户密码" autocomplete="off">
+                            </div>
+                            <div class="td2 J_showtip_box"></div>
+                            <div class="clear"></div>
                         </div>
-                        <div class="td2 J_showtip_box"></div>
-                        <div class="clear"></div>
-                    </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;">
-                                <option value="1" selected="selected">────&nbsp;需要找工作&nbsp;────</option>
-                                <option value="2" >────&nbsp;已找到工作&nbsp;────</option>
-                            </select>
+                        <div class="J_validate_group">
+                            <div class="td1" >
+                                <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="td2 J_showtip_box"></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">
-                    <input type="hidden" name="utype" value="2">
-                    <div class="btnbox"><input id="btnMoilbPhoneRegister" type="submit" value="注册" class="btn_reg J_hoverbut"></div>
-                    <input type="hidden" id="origin_btnCheckMobile" style="display: none;"><input type="hidden" id="btnCheckMobile">
-                </form>
-            </div>
-            <!-- 邮箱注册-->
-            <div class="tabshow" style="display:block">
-                <form class="J_passwordalert_group" id="regEmailForm" action="" method="post" onkeydown="if(event.keyCode==13){return false;}">
-                    {{csrf_field()}}
-                    <input type="hidden" name="reg_source" value="1">
-                    <div class="J_validate_group">
-                        <div class="td1">
-                            <input class="input_295_34" name="username" id="username" type="text" placeholder="请输入用户名" autocomplete="off">
+                        <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="td2 J_showtip_box"></div>
-                        <div class="clear"></div>
-                    </div>
-
-                    <div class="J_validate_group">
-                        <div class="td1">
-                            <input class="input_295_34" name="id_card" class="id_card" type="text" placeholder="请输入身份证号码" autocomplete="off">
+                        <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="td2 J_showtip_box"></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">
+                        <input type="hidden" name="utype" value="2">
+                        <div class="btnbox"><input id="btnMoilbPhoneRegister" type="submit" value="注册" class="btn_reg J_hoverbut"></div>
+                        <input type="hidden" id="origin_btnCheckMobile" style="display: none;"><input type="hidden" id="btnCheckMobile">
+                    </form>
+                </div>
+                <!-- 邮箱注册-->
+                <div class="tabshow">
+                    <form class="J_passwordalert_group" id="regEmailForm" action="" method="post" onkeydown="if(event.keyCode==13){return false;}">
+                        {{csrf_field()}}
+                        <input type="hidden" name="reg_source" value="1" />
+                        <input type="hidden" name="reg_type" value="2">
+                        {{--<div class="J_validate_group">
+                            <div class="td1">
+                                <input class="input_295_34" name="username" id="username" type="text" placeholder="请输入用户名" autocomplete="off">
+                            </div>
+                            <div class="td2 J_showtip_box"></div>
+                            <div class="clear"></div>
+                        </div>
+
+                        <div class="J_validate_group">
+                            <div class="td1">
+                                <input class="input_295_34" name="id_card" class="id_card" type="text" placeholder="请输入身份证号码" autocomplete="off">
+                            </div>
+                            <div class="td2 J_showtip_box"></div>
+                            <div class="clear"></div>
+                        </div>--}}
 
-                    <div class="J_validate_group">
-                        <div class="td1">
-                            <div class="reg-form-content">
-                                <input class="input_295_34 inputElem" name="email" id="email" type="text" placeholder="请输入常用邮箱" autocomplete="off">
+                        <div class="J_validate_group">
+                            <div class="td1">
+                                <div class="reg-form-content">
+                                    <input class="input_295_34 inputElem" name="email" id="email" type="text" placeholder="请输入常用邮箱" autocomplete="off">
+                                </div>
                             </div>
+                            <div class="td2 J_showtip_box"></div>
+                            <div class="clear"></div>
                         </div>
-                        <div class="td2 J_showtip_box"></div>
-                        <div class="clear"></div>
-                    </div>
-                    <div class="J_validate_group">
-                        <div class="td1">
-                            <input class="input_295_34 J_passwordalert" name="password" id="email_password" type="password" placeholder="请输入账户密码" autocomplete="off">
+                        <div class="J_validate_group">
+                            <div class="td1">
+                                <input class="input_295_34 J_passwordalert" name="password" id="email_password" type="password" placeholder="请输入账户密码" autocomplete="off">
+                            </div>
+                            <div class="td2 J_showtip_box"></div>
+                            <div class="clear"></div>
                         </div>
-                        <div class="td2 J_showtip_box"></div>
-                        <div class="clear"></div>
-                    </div>
-                    <div class="safety">
-                        <div class="slist t1">危险</div>
-                        <div class="slist t2">一般</div>
-                        <div class="slist t3">安全</div>
-                        <div class="clear"></div>
-                    </div>
-                    <div class="J_validate_group">
-                        <div class="td1">
-                            <input class="input_295_34" name="password_confirmation" id="password_confirmation" type="password" placeholder="请确认账户密码" autocomplete="off">
+                        <div class="safety">
+                            <div class="slist t1">危险</div>
+                            <div class="slist t2">一般</div>
+                            <div class="slist t3">安全</div>
+                            <div class="clear"></div>
                         </div>
-                        <div class="td2 J_showtip_box"></div>
-                        <div class="clear"></div>
-                    </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;">
-                                <option value="1" selected="selected">────&nbsp;需要找工作&nbsp;────</option>
-                                <option value="2" >────&nbsp;已找到工作&nbsp;────</option>
-                            </select>
+                        <div class="J_validate_group">
+                            <div class="td1">
+                                <input class="input_295_34" name="password_confirmation" id="password_confirmation" type="password" placeholder="请确认账户密码" autocomplete="off">
+                            </div>
+                            <div class="td2 J_showtip_box"></div>
+                            <div class="clear"></div>
                         </div>
-                        <div class="td2 J_showtip_box"></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">
-                    <input type="hidden" name="utype" value="2">
-                    <div class="btnbox"><input id="btnEmailRegister" type="submit" value="注册" class="btn_reg J_hoverbut"></div>
-                    <input type="hidden" id="origin_btnCheckEmail" style="display: none;"><input type="hidden" id="btnCheckEmail">
-                </form>
-            </div>
-        </div>
-        <div class="rr">
-        	<a href="{{route('jkq.home')}}" class="gohome">返回首页</a>
-            <div id="thirdlogin-wechat-web" class="webchat-login-code"></div>
-            <div id="other-thirdlogin" class="loginappimg">
-                <p class="txt">使用合作账号直接登录</p>
+                        <div class="J_validate_group">
+                            <div class="td1" >
+                                <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">
+                        <input type="hidden" name="utype" value="2">
+                        <div class="btnbox"><input id="btnEmailRegister" type="submit" value="注册" class="btn_reg J_hoverbut"></div>
+                        <input type="hidden" id="origin_btnCheckEmail" style="display: none;"><input type="hidden" id="btnCheckEmail">
+                    </form>
+                </div>
             </div>
-            <div class="tittxt">已经有{{subsite_config('aix.system.site.site.site_name')}}账号:
-            	<div class="logintxt"><a href="{{route('jkq.login')}}" class=" J_hoverbut btn_blue btn_inline">直接登录</a></div>
+            <div class="rr">
+                <a href="{{route('jkq.home')}}" class="gohome">返回首页</a>
+                {{--<div id="thirdlogin-wechat-web" class="webchat-login-code"></div>--}}
+                <div id="thirdlogin-wechat-web" class="webchat-login-code"><img src="{{upload_asset($qrcode)}}"/></div>
+                <div id="other-thirdlogin" class="loginappimg">
+                    {{--<p class="txt">使用合作账号直接登录</p>--}}
+                    <p class="txt">可添加工作人员微信了解更多讯息</p>
+                </div>
+                <div class="tittxt">已经有{{subsite_config('aix.system.site.site.site_name')}}账号:
+                    <div class="logintxt"><a href="{{route('jkq.login')}}" class=" J_hoverbut btn_blue btn_inline">直接登录</a></div>
+                </div>
+
             </div>
-            
+            <div class="clear"></div>
         </div>
-        <div class="clear"></div>
+        <input type="hidden" id="J_captcha_open" value="{{config('aix.system.site_safety.site_vo_code.captcha_open', 0) }}">
+        <input type="hidden" id="J_config_varify_reg" value="1">
     </div>
-    <input type="hidden" id="J_captcha_open" value="{{config('aix.system.site_safety.site_vo_code.captcha_open', 0) }}">
-    <input type="hidden" id="J_config_varify_reg" value="1">
-</div>
 @endsection
 
 @section('script')
@@ -211,6 +274,7 @@
     <script type="text/javascript" src="{{ theme_asset('app/js/members/jquery.pwdalert.js') }}"></script>
     <script type="text/javascript" src="{{ theme_asset('app/js/emailAutoComplete.js') }}"></script>
     <script type="text/javascript" src="{{ theme_asset('app/js/jquery.placeholder.min.js') }}"></script>
+    <script src="{{theme_asset('statistics/js/layer/layer.js')}}"></script>
     <script src="{{ theme_asset('app/js/members/jquery.common.js') }}"></script>
     <script src="{{ theme_asset('app/js/jquery.listitem.js') }}"></script>
     @include('module.widgets.thirdlogin')
@@ -251,6 +315,180 @@
             }
         })
 
+        //发送短信
+        var handler = function(captchaObj) {
+            captchaObj.appendTo("#popup-captcha");
+            captchaObj.onSuccess(function() {
+                var result = captchaObj.getValidate();
+                toSetSms(result);
+            });
+
+            captchaObj.onError(function() {
+
+            });
+            $('#getVerfyCode').on('click', function () {
+                var mobileValue = $.trim($('input[name=mobile]').val());
+                if (mobileValue == '') {
+                    qsToast({type:2,context: '请输入手机号'});
+                    return false;
+                }
+                captchaObj.verify();
+
+            });
+        };
+        // gt_init(handler);
+
+        $('#getVerfyCode').on('click', function () {
+            var mobileValue = $.trim($('input[name=mobile]').val());
+            if (mobileValue == '') {
+                // alert('请输入手机号');
+                qsToast({type:2,context: '请输入手机号'});
+                return false;
+            }
+            toSetSms({});
+
+        });
+
+        // 发送手机验证码
+        function toSetSms(geet_result) {
+            var mobileValue = $.trim($('input[name=mobile]').val());
+
+            function settime(countdown) {
+                if (countdown == 0) {
+                    $('#getVerfyCode').removeClass('qs-btn-border-disabled');
+                    $('#getVerfyCode').text('获取验证码');
+                    countdown = 180;
+                    return;
+                } else {
+                    $('#getVerfyCode').addClass('qs-btn-border-disabled');
+                    $('#getVerfyCode').text('重新发送' + countdown + '秒');
+                    countdown--;
+                }
+                setTimeout(function () {
+                    settime(countdown)
+                }, 1000)
+            }
+
+            $('#getVerfyCode').prop("disabled", !0);
+            $('#getVerfyCode').addClass('qs-btn-border-disabled');
+            $('#getVerfyCode').text('发送中...');
+            geet_result.mobile = mobileValue;
+            geet_result.type = "register";
+            $.ajax({
+                url: "{{route('sms.send')}}",
+                type: 'POST',
+                dataType: 'json',
+                data: geet_result,
+                success: function (data) {
+                    // console.log(data);
+                    setTimeout(function () {
+                        qsToast({type: 2, context: '验证码已发送,请注意查收'});
+                        // 开始倒计时
+                        var countdowns = 180;
+                        settime(countdowns);
+                    }, 1000)
+                },
+                error: function (errorData) {
+                    // console.log(errorData);
+                    var response = $.parseJSON(errorData.response);
+                    if (errorData.status == 422) {//验证错误
+                        $.each(response.errors, function (key, val) {
+                            qsToast({type: 2, context: val[0]});
+                            return false;
+                        });
+                    } else if (errorData.status == 400) {//业务错误
+                        qsToast({type: 2, context: response.message});
+                    }
+                    setTimeout(function () {
+                        $('#getVerfyCode').prop("disabled", 0);
+                        $('#getVerfyCode').removeClass('qs-btn-border-disabled');
+                        $('#getVerfyCode').text('获取验证码');
+                    }, 1500)
+                }
+            });
+        }
+        $('#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>
+        $('#btnMoilbPhoneRegister').click(function(){
+            $('#btnMoilbPhoneRegister').val('注册中...').addClass('btn_disabled').prop('disabled', !0);
+            $.ajax({
+                url: person_register_url,
+                type: 'POST',
+                dataType: 'json',
+                data: $('#regMobileForm').serialize(),
+                success: function (data) {
+                    disapperTooltip("success","注册成功,正在为你跳转..");
+                    setTimeout(function () {
+                        window.location.href = data.data.url;
+                    },1000)
+
+                },
+                error:function(data) {
+                    console.log(data);
+                    var error_obj=eval('(' + data.responseText + ')');
+                    if ($('#regMobileForm input[name="agreement"]').is(':checked')) {
+                        $('#btnMoilbPhoneRegister').val('注册').removeClass('btn_disabled').prop('disabled', 0);
+                    }
+                    if (data.status == 422) {//验证错误
+                        $.each(error_obj.errors, function (key, val) {
+                            disapperTooltip("remind", val[0]);
+                        });
+                    }
+                    else if (data.status == 400) {//业务错误
+                        disapperTooltip("remind", error_obj.message);
+                    }
+                }
+            });
+            return false;
+        });
+
+        $('#btnEmailRegister').click(function(){
+            $('#btnEmailRegister').val('注册中...').addClass('btn_disabled').prop('disabled', !0);
+            $.ajax({
+                url: person_register_url,
+                type: 'POST',
+                dataType: 'json',
+                data: $('#regEmailForm').serialize(),
+                success: function (data) {
+                    disapperTooltip("success","注册成功,正在为你跳转..");
+                    setTimeout(function () {
+                        window.location.href = data.data.url;
+                    },1000)
+
+                },
+                error:function(data) {
+                    console.log(data);
+                    var error_obj=eval('(' + data.responseText + ')');
+                    if ($('#regEmailForm input[name="agreement"]').is(':checked')) {
+                        $('#btnEmailRegister').val('注册').removeClass('btn_disabled').prop('disabled', 0);
+                    }
+                    if (data.status == 422) {//验证错误
+                        $.each(error_obj.errors, function (key, val) {
+                            disapperTooltip("remind", val[0]);
+                        });
+                    }
+                    else if (data.status == 400) {//业务错误
+                        disapperTooltip("remind", error_obj.message);
+                    }
+                }
+            });
+            return false;
+        });
+
     </script>
-    <script type="text/javascript" src="{{ theme_asset('app/js/members/jquery.validate.regpersonal.js') }}"></script>
+    {{--    <script type="text/javascript" src="{{ theme_asset('app/js/members/jquery.validate.regpersonal.js') }}?v=1"></script>--}}
 @endsection

+ 98 - 76
public/themes/default/views/mobile/app/active/spring.blade.php

@@ -15,7 +15,7 @@
 
 @section('content')
     <div class="online2021_header">
-        <img src="{{theme_asset('mobile/images/spring/header_2024.png')}}?v=4">
+        <img src="{{theme_asset('mobile/images/spring/header_2025.png')}}?v=1">
     </div>
 
     <div class="online2021_title">
@@ -89,16 +89,28 @@
             </tr>
             <tr>
                 <td>经济开发区会场</td>
-                <td>2月20日-22日(正月十一-十三)</td>
+                <td>2月13日-15日(正月十六-十八)</td>
                 <td>万益商业广场</td>
             </tr>
-            <tr>
-                <td>经济开发区会场</td>
-                <td>常态化运营</td>
-                <td>晋江经济开发区人力资源服务站</td>
-            </tr>
         </table>
-        <div class="btn btn_one"><a href="https://mp.weixin.qq.com/s/4pHWqNEPmY4GykNOVxEbAQ">了解详情</a></div>
+        {{--        <div class="btn btn_one"><a href="https://mp.weixin.qq.com/s/4pHWqNEPmY4GykNOVxEbAQ">了解详情</a></div>--}}
+    </div>
+    <div class="onine2021_lottery">
+        <div class="content_box content_box_two">
+            <img class="content_header" src="{{ theme_asset('mobile/images/online2021/lottery_gift.png') }}">
+            <div class="grid">
+                @foreach($prize as $k => $v)
+                    @if ($k < 3)
+                    <div class="grid_item grid_item3">
+                        <div class="grid_item_content lw_hairline">
+                            <img class="grid_item_img" src="{{ upload_asset($v->prize_image) }}">
+                            <span class="grid_item_text">{{$v->prize_name}}</span>
+                        </div>
+                    </div>
+                    @endif
+                @endforeach
+            </div>
+        </div>
     </div>
     <div class="online2021_title">
         <p>晋江聚才网网络直播招聘会</p>
@@ -111,14 +123,15 @@
                         <img src="{{$v['images']}}" border="0">
                     </div>
                     <div class="info to_live" data-url="{{$v['url']}}">
-                        <div class="line-one substring"><span style="color:#000000;font-weight:bold;">{{$v['name']}}</span></div>
+                        <div class="line-one substring"><span
+                                    style="color:#000000;font-weight:bold;">{{$v['name']}}</span></div>
                         <div class="line-two font12">
                             <img src="{{theme_asset('mobile/images/online2021/icon_time.png')}}">{{$v['time']}}
                         </div>
                         <div class="line-two font12 substring"></div>
-                        <div class="line-two font9 font-red">
-                            (扫描求职交流微信群,红包礼品等你拿)
-                        </div>
+{{--                        <div class="line-two font9 font-red">--}}
+{{--                            (扫描求职交流微信群,红包礼品等你拿)--}}
+{{--                        </div>--}}
                     </div>
                     <div class="clear"></div>
                 </div>
@@ -136,15 +149,23 @@
                 <th>路线安排</th>
             </tr>
             <tr>
-                <td>2024年2月21日-2024年2月25日</td>
-                <td>贵州黔西市、织金县</td>
+                <td>2025年2月7日-11日</td>
+                <td>贵州省关岭县与安龙县</td>
+            </tr>
+            <tr>
+                <td>2025年2月8日-12日</td>
+                <td>四川省蓬安县与营山县</td>
             </tr>
             <tr>
-                <td>2024年2月22日-2024年2月26日</td>
-                <td>贵州习水县、桐梓县</td>
+                <td>2025年2月10日-14日</td>
+                <td>云南省文山县与红河州</td>
             </tr>
         </table>
-        <div class="btn btn_one"><a href="javascript:showWechat()">点击报名</a></div>
+        <div>
+            <div class="btn btn_left"><a href="javascript:showWechat()">点击报名</a></div>
+            <div class="btn btn_right"><a href="https://mp.weixin.qq.com/s/L8erftGzeDaImOgtJjYl9Q">了解详情</a></div>
+        </div>
+        {{--        <div class="btn btn_one"><a href="javascript:showWechat()">点击报名</a></div>--}}
         {{--<div class="btn btn_one"><a href="https://mp.weixin.qq.com/s/GtTvgRM6ko7N_yFamwu7AQ">点击报名</a></div>--}}
         <div class="clear"></div>
     </div>
@@ -153,6 +174,19 @@
         <p>抽奖活动</p>
     </div>
     <div class="onine2021_lottery">
+        <div class="content_box content_box_two">
+            <img class="content_header" src="{{ theme_asset('mobile/images/online2021/lottery_gift.png') }}">
+            <div class="grid">
+                @foreach($prize as $v)
+                    <div class="grid_item">
+                        <div class="grid_item_content lw_hairline">
+                            <img class="grid_item_img" src="{{ upload_asset($v->prize_image) }}">
+                            <span class="grid_item_text">{{$v->prize_name}}</span>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
+        </div>
         @foreach ($images as $k => $v)
             <img src="{{ $v }}" id="gift-img{{$k}}" style="display:none;"/>
         @endforeach
@@ -169,64 +203,51 @@
             </div>
         </div>
         <img class="lottery_logo" src="{{ theme_asset('mobile/images/online2021/lottery_logo.png') }}"/>
+{{--        <div class="content_box content_box_one">--}}
+{{--            <img class="content_header" src="{{ theme_asset('mobile/images/online2021/lottery_description.png') }}">--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_title">※一重礼(签到礼):</span>--}}
+{{--                <span class="description_content">凭“折页”于2月20-2月22日(正月十一至正月十三)期间可到场领取签到礼一份,2月20日早上9:00-11:00期间到场,可领取升级版签到礼,数量有限,先到先得!</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_title">※二重礼(关注礼):</span>--}}
+{{--                <span class="description_content">扫描二维码,关注公众号,即可参与线上(聚才网)转盘抽关注礼,100%中奖!</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_title">※三重礼(积极礼):</span>--}}
+{{--                <span class="description_content">参加晋江经济开发区新春线下招聘会,应聘一家可获一张“红色礼券”,集满5张可领取应聘积极礼一份。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_title">※四重礼(转盘礼):</span>--}}
+{{--                <span class="description_content">应聘成功,可领取对应企业发放的“金色礼券”一张,获得新春招聘会大转盘抽奖一次。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_title">※五重礼(热心礼):</span>--}}
+{{--                <span class="description_content">朋友圈/视频号/抖音号转发活动现场图片或视频,集满18个赞,即可获得热心礼一份。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_title">※六重礼(游园礼):</span>--}}
+{{--                <span class="description_content">消费万益广场任意一家门店(凭小票或消费记录),即可获得“游园礼”,含生活大礼包5件套。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description mt20">--}}
+{{--                <span class="description_title black">抽奖时间:</span>--}}
+{{--                <span class="description_content">2024年1月23日至2024年2月22日。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description mt20">--}}
+{{--                <span class="description_title black">领取方式:</span>--}}
+{{--                <span class="description_content">2024年2月20日-2024年2月22日上午9点-下午16点在招聘活动现场签到处(万益商业广场麦当劳店旁)。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_content">图片仅供参考,礼品以最终实物为准。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_content">晋江聚才网客服热线:0595-88223456。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_content">经济开发区领奖热线:0595-82008301。</span>--}}
+{{--            </p>--}}
+{{--        </div>--}}
         <div class="content_box content_box_one">
-            <img class="content_header" src="{{ theme_asset('mobile/images/online2021/lottery_description.png') }}">
-            <p class="lottery_description">
-                <span class="description_title">※一重礼(签到礼):</span>
-                <span class="description_content">凭“折页”于2月20-2月22日(正月十一至正月十三)期间可到场领取签到礼一份,2月20日早上9:00-11:00期间到场,可领取升级版签到礼,数量有限,先到先得!</span>
-            </p>
-            <p class="lottery_description">
-                <span class="description_title">※二重礼(关注礼):</span>
-                <span class="description_content">扫描二维码,关注公众号,即可参与线上(聚才网)转盘抽关注礼,100%中奖!</span>
-            </p>
-            <p class="lottery_description">
-                <span class="description_title">※三重礼(积极礼):</span>
-                <span class="description_content">参加晋江经济开发区新春线下招聘会,应聘一家可获一张“红色礼券”,集满5张可领取应聘积极礼一份。</span>
-            </p>
-            <p class="lottery_description">
-                <span class="description_title">※四重礼(转盘礼):</span>
-                <span class="description_content">应聘成功,可领取对应企业发放的“金色礼券”一张,获得新春招聘会大转盘抽奖一次。</span>
-            </p>
-            <p class="lottery_description">
-                <span class="description_title">※五重礼(热心礼):</span>
-                <span class="description_content">朋友圈/视频号/抖音号转发活动现场图片或视频,集满18个赞,即可获得热心礼一份。</span>
-            </p>
-            <p class="lottery_description">
-                <span class="description_title">※六重礼(游园礼):</span>
-                <span class="description_content">消费万益广场任意一家门店(凭小票或消费记录),即可获得“游园礼”,含生活大礼包5件套。</span>
-            </p>
-            <p class="lottery_description mt20">
-                <span class="description_title black">抽奖时间:</span>
-                <span class="description_content">2024年1月23日至2024年2月22日。</span>
-            </p>
-            <p class="lottery_description mt20">
-                <span class="description_title black">领取方式:</span>
-                <span class="description_content">2024年2月20日-2024年2月22日上午9点-下午16点在招聘活动现场签到处(万益商业广场麦当劳店旁)。</span>
-            </p>
-            <p class="lottery_description">
-                <span class="description_content">图片仅供参考,礼品以最终实物为准。</span>
-            </p>
-            <p class="lottery_description">
-                <span class="description_content">晋江聚才网客服热线:0595-88223456。</span>
-            </p>
-            <p class="lottery_description">
-                <span class="description_content">经济开发区领奖热线:0595-82008301。</span>
-            </p>
-        </div>
-        <div class="content_box content_box_two">
-            <img class="content_header" src="{{ theme_asset('mobile/images/online2021/lottery_gift.png') }}">
-            <div class="grid">
-                @foreach($prize as $v)
-                    <div class="grid_item">
-                        <div class="grid_item_content lw_hairline">
-                            <img class="grid_item_img" src="{{ upload_asset($v->prize_image) }}">
-                            <span class="grid_item_text">{{$v->prize_name}}</span>
-                        </div>
-                    </div>
-                @endforeach
-            </div>
-        </div>
-        <div class="content_box content_box_three">
             <img class="content_header" src="{{ theme_asset('mobile/images/online2021/lottery_win.png') }}">
             @if (!empty($user))
                 @foreach($win as $k => $v)
@@ -451,12 +472,13 @@
             });
             event.stopPropagation();
         });
-        $('.to_live').click(function(){
+        $('.to_live').click(function () {
             url = $(this).data('url');
             location.href = url;
         });
+
         function showWechat() {
-            var str='<img style="width:100%;display:block;margin:0 auto;" src="{{theme_asset('app/images/online2021/province_out.jpg')}}"/><p style="text-align:center;font-size:18px;color:#EC0C00;">添加微信好友报名参加赴省外招聘活动</p>';
+            var str = '<img style="width:100%;display:block;margin:0 auto;" src="{{theme_asset('app/images/online2021/province_out.jpg')}}"/><p style="text-align:center;font-size:18px;color:#EC0C00;">添加微信好友报名参加赴省外招聘活动</p>';
             layer.open({
                 title: [
                     '微信扫码',

+ 1 - 1
public/themes/default/views/mobile/app/active/spring_special.blade.php

@@ -32,7 +32,7 @@
 @endpush
 @section('content')
     <div class="online2021_header">
-        <img src="{{theme_asset('mobile/images/spring/header_2024.png')}}?v=4">
+        <img src="{{theme_asset('mobile/images/spring/header_2025.png')}}?v=1">
     </div>
     <div class="online2021_title">
         <p>{{$title}}</p>

+ 118 - 108
public/themes/default/views/mobile/app/active/spring_special_jkq.blade.php

@@ -10,57 +10,57 @@
     <link href="{{ theme_asset('mobile/css/lottery.css') }}" rel="stylesheet">
     <link rel="stylesheet" href="{{theme_asset('mobile/css/online2021_special.css')}}">
     <style>
-        body{
-            background:#ec0d00;
+        body {
+            background: #ec0d00;
         }
 
-        .online2021_title{
-            background-image:url('{{theme_asset("mobile/images/online2021/bg_title_special_jkq.png")}}');
-            width:100%;
-            height:100px;
-            background-size:100% 100%;
+        .online2021_title {
+            background-image: url('{{theme_asset("mobile/images/online2021/bg_title_special_jkq.png")}}');
+            width: 100%;
+            height: 100px;
+            background-size: 100% 100%;
         }
 
-        .online2021_job_fair img{
-            width:90%;
-            display:block;
-            margin:20px auto 10px auto;
+        .online2021_job_fair img {
+            width: 90%;
+            display: block;
+            margin: 20px auto 10px auto;
         }
 
-        .online2021_title p{
-            color:#ec0d00;
+        .online2021_title p {
+            color: #ec0d00;
         }
 
-        .load_more_footer{
-            width:100%;
-            text-align:center;
-            line-height:1rem;
-            color:white;
+        .load_more_footer {
+            width: 100%;
+            text-align: center;
+            line-height: 1rem;
+            color: white;
         }
 
-        .live_header{
-            width:100%;
-            height:30px;
-            display:flex;
-            background:#FEFDD2;
-            font-size:.27rem;
-            justify-content:space-around;
-            position:fixed;
-            left:0;
-            top:0;
-            z-index:999;
-            font-family:"黑体";
+        .live_header {
+            width: 100%;
+            height: 30px;
+            display: flex;
+            background: #FEFDD2;
+            font-size: .27rem;
+            justify-content: space-around;
+            position: fixed;
+            left: 0;
+            top: 0;
+            z-index: 999;
+            font-family: "黑体";
         }
 
-        .live_header .live_item{
-            padding:0 5px;
-            height:30px;
-            line-height:30px;
+        .live_header .live_item {
+            padding: 0 5px;
+            height: 30px;
+            line-height: 30px;
         }
 
-        .live_header_box{
-            width:100%;
-            height:30px;
+        .live_header_box {
+            width: 100%;
+            height: 30px;
         }
     </style>
 @endpush
@@ -71,7 +71,7 @@
 @section('content')
     @if(empty($source))
         <div class="online2021_header">
-            <img src="{{theme_asset('mobile/images/spring/header_2024.png')}}?v=4">
+            <img src="{{theme_asset('mobile/images/spring/header_2025.png')}}?v=1">
         </div>
     @else
         <div class="live_header">
@@ -126,9 +126,9 @@
                             <img src="{{theme_asset('mobile/images/online2021/icon_time.png')}}">{{$v['time']}}
                         </div>
                         <div class="line-two font12 substring"></div>
-                        <div class="line-two font9 font-red">
-                            (扫描求职交流微信群,红包礼品等你拿)
-                        </div>
+                        {{--                        <div class="line-two font9 font-red">--}}
+                        {{--                            (扫描求职交流微信群,红包礼品等你拿)--}}
+                        {{--                        </div>--}}
                     </div>
                     <div class="clear"></div>
                 </div>
@@ -146,15 +146,23 @@
                 <th>路线安排</th>
             </tr>
             <tr>
-                <td>2024年2月21日-2024年2月25日</td>
-                <td>贵州黔西市、织金县</td>
+                <td>2025年2月7日-11日</td>
+                <td>贵州省关岭县与安龙县</td>
+            </tr>
+            <tr>
+                <td>2025年2月8日-12日</td>
+                <td>四川省蓬安县与营山县</td>
             </tr>
             <tr>
-                <td>2024年2月22日-2024年2月26日</td>
-                <td>贵州习水县、桐梓县</td>
+                <td>2025年2月10日-14日</td>
+                <td>云南省文山县与红河州</td>
             </tr>
         </table>
-        <div class="btn btn_one"><a href="javascript:showWechat()">点击报名</a></div>
+        <div>
+            <div class="btn btn_left"><a href="javascript:showWechat()">点击报名</a></div>
+            <div class="btn btn_right"><a href="https://mp.weixin.qq.com/s/L8erftGzeDaImOgtJjYl9Q">了解详情</a></div>
+        </div>
+        {{--        <div class="btn btn_one"><a href="javascript:showWechat()">点击报名</a></div>--}}
         {{--<div class="btn btn_one"><a href="https://mp.weixin.qq.com/s/GtTvgRM6ko7N_yFamwu7AQ">点击报名</a></div>--}}
         <div class="clear"></div>
     </div>
@@ -163,6 +171,19 @@
         <p>抽奖活动</p>
     </div>
     <div class="onine2021_lottery">
+        <div class="content_box content_box_two">
+            <img class="content_header" src="{{ theme_asset('mobile/images/online2021/lottery_gift.png') }}?v=1">
+            <div class="grid">
+                @foreach($prize as $v)
+                    <div class="grid_item">
+                        <div class="grid_item_content lw_hairline">
+                            <img class="grid_item_img" src="{{ upload_asset($v->prize_image) }}">
+                            <span class="grid_item_text">{{$v->prize_name}}</span>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
+        </div>
         @foreach ($images as $k => $v)
             <img src="{{ $v }}" id="gift-img{{$k}}" style="display:none;"/>
         @endforeach
@@ -179,64 +200,51 @@
             </div>
         </div>
         <img class="lottery_logo" src="{{ theme_asset('mobile/images/online2021/lottery_logo.png') }}"/>
-            <div class="content_box content_box_one">
-                <img class="content_header" src="{{ theme_asset('mobile/images/online2021/lottery_description.png') }}?v=1">
-                <p class="lottery_description">
-                    <span class="description_title">※一重礼(签到礼):</span>
-                    <span class="description_content">凭“折页”于2月20-2月22日(正月十一至正月十三)期间可到场领取签到礼一份,2月20日早上9:00-11:00期间到场,可领取升级版签到礼,数量有限,先到先得!</span>
-                </p>
-                <p class="lottery_description">
-                    <span class="description_title">※二重礼(关注礼):</span>
-                    <span class="description_content">扫描二维码,关注公众号,即可参与线上(聚才网)转盘抽关注礼,100%中奖!</span>
-                </p>
-                <p class="lottery_description">
-                    <span class="description_title">※三重礼(积极礼):</span>
-                    <span class="description_content">参加晋江经济开发区新春线下招聘会,应聘一家可获一张“红色礼券”,集满5张可领取应聘积极礼一份。</span>
-                </p>
-                <p class="lottery_description">
-                    <span class="description_title">※四重礼(转盘礼):</span>
-                    <span class="description_content">应聘成功,可领取对应企业发放的“金色礼券”一张,获得新春招聘会大转盘抽奖一次。</span>
-                </p>
-                <p class="lottery_description">
-                    <span class="description_title">※五重礼(热心礼):</span>
-                    <span class="description_content">朋友圈/视频号/抖音号转发活动现场图片或视频,集满18个赞,即可获得热心礼一份。</span>
-                </p>
-                <p class="lottery_description">
-                    <span class="description_title">※六重礼(游园礼):</span>
-                    <span class="description_content">消费万益广场任意一家门店(凭小票或消费记录),即可获得“游园礼”,含生活大礼包5件套。</span>
-                </p>
-                <p class="lottery_description mt20">
-                    <span class="description_title black">抽奖时间:</span>
-                    <span class="description_content">2024年1月23日至2024年2月22日。</span>
-                </p>
-                <p class="lottery_description mt20">
-                    <span class="description_title black">领取方式:</span>
-                    <span class="description_content">2024年2月20日-2024年2月22日上午9点-下午16点在招聘活动现场签到处(万益商业广场麦当劳店旁)。</span>
-                </p>
-                <p class="lottery_description">
-                    <span class="description_content">图片仅供参考,礼品以最终实物为准。</span>
-                </p>
-                <p class="lottery_description">
-                    <span class="description_content">晋江聚才网客服热线:0595-88223456。</span>
-                </p>
-                <p class="lottery_description">
-                    <span class="description_content">经济开发区领奖热线:0595-82008301。</span>
-                </p>
-            </div>
-        <div class="content_box content_box_two">
-            <img class="content_header" src="{{ theme_asset('mobile/images/online2021/lottery_gift.png') }}?v=1">
-            <div class="grid">
-                @foreach($prize as $v)
-                    <div class="grid_item">
-                        <div class="grid_item_content lw_hairline">
-                            <img class="grid_item_img" src="{{ upload_asset($v->prize_image) }}">
-                            <span class="grid_item_text">{{$v->prize_name}}</span>
-                        </div>
-                    </div>
-                @endforeach
-            </div>
-        </div>
-        <div class="content_box content_box_three">
+{{--        <div class="content_box content_box_one">--}}
+{{--            <img class="content_header" src="{{ theme_asset('mobile/images/online2021/lottery_description.png') }}?v=1">--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_title">※一重礼(签到礼):</span>--}}
+{{--                <span class="description_content">凭“折页”于2月20-2月22日(正月十一至正月十三)期间可到场领取签到礼一份,2月20日早上9:00-11:00期间到场,可领取升级版签到礼,数量有限,先到先得!</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_title">※二重礼(关注礼):</span>--}}
+{{--                <span class="description_content">扫描二维码,关注公众号,即可参与线上(聚才网)转盘抽关注礼,100%中奖!</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_title">※三重礼(积极礼):</span>--}}
+{{--                <span class="description_content">参加晋江经济开发区新春线下招聘会,应聘一家可获一张“红色礼券”,集满5张可领取应聘积极礼一份。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_title">※四重礼(转盘礼):</span>--}}
+{{--                <span class="description_content">应聘成功,可领取对应企业发放的“金色礼券”一张,获得新春招聘会大转盘抽奖一次。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_title">※五重礼(热心礼):</span>--}}
+{{--                <span class="description_content">朋友圈/视频号/抖音号转发活动现场图片或视频,集满18个赞,即可获得热心礼一份。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_title">※六重礼(游园礼):</span>--}}
+{{--                <span class="description_content">消费万益广场任意一家门店(凭小票或消费记录),即可获得“游园礼”,含生活大礼包5件套。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description mt20">--}}
+{{--                <span class="description_title black">抽奖时间:</span>--}}
+{{--                <span class="description_content">2024年1月23日至2024年2月22日。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description mt20">--}}
+{{--                <span class="description_title black">领取方式:</span>--}}
+{{--                <span class="description_content">2024年2月20日-2024年2月22日上午9点-下午16点在招聘活动现场签到处(万益商业广场麦当劳店旁)。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_content">图片仅供参考,礼品以最终实物为准。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_content">晋江聚才网客服热线:0595-88223456。</span>--}}
+{{--            </p>--}}
+{{--            <p class="lottery_description">--}}
+{{--                <span class="description_content">经济开发区领奖热线:0595-82008301。</span>--}}
+{{--            </p>--}}
+{{--        </div>--}}
+        <div class="content_box content_box_one">
             <img class="content_header" src="{{ theme_asset('mobile/images/online2021/lottery_win.png') }}?v=1">
             @if (!empty($user))
                 @foreach($win as $k => $v)
@@ -346,7 +354,8 @@
                     '长按识别二维码',
                     'background-color: #FF4351; color:#fff;'
                 ]
-                , content: '<img src="{{theme_asset('mobile/images/online2021/qrcode_job_order.png')}}" style="width:100%;" />'
+                ,
+                content: '<img src="{{theme_asset('mobile/images/online2021/qrcode_job_order.png')}}" style="width:100%;" />'
             });
         });
         $('.company_order').click(function () {
@@ -356,7 +365,8 @@
                     '长按识别二维码',
                     'background-color: #FF4351; color:#fff;'
                 ]
-                , content: '<img src="{{theme_asset('mobile/images/online2021/qrcode_company_order.jpg')}}" style="width:100%;" />'
+                ,
+                content: '<img src="{{theme_asset('mobile/images/online2021/qrcode_company_order.jpg')}}" style="width:100%;" />'
             });
         });
 
@@ -547,7 +557,7 @@
             });
             event.stopPropagation();
         });
-        $('.to_live').click(function(){
+        $('.to_live').click(function () {
             url = $(this).data('url');
             location.href = url;
         });
@@ -646,7 +656,7 @@
         });
 
         function showWechat() {
-            var str='<img style="width:100%;display:block;margin:0 auto;" src="{{theme_asset('app/images/online2021/province_out.jpg')}}"/><p style="text-align:center;font-size:18px;color:#EC0C00;">添加微信好友报名参加赴省外招聘活动</p>';
+            var str = '<img style="width:100%;display:block;margin:0 auto;" src="{{theme_asset('app/images/online2021/province_out.jpg')}}"/><p style="text-align:center;font-size:18px;color:#EC0C00;">添加微信好友报名参加赴省外招聘活动</p>';
             layer.open({
                 title: [
                     '微信扫码',

+ 5 - 5
public/themes/default/views/mobile/module/section/online_footer.blade.php

@@ -1,16 +1,16 @@
 <div class="bottom-nav-bar-group">
     <div class="bottom-nav-bar">
         <div class="nav-bar-cell qs-left" style="width: 100%;">
-            <a href="{{route('mobile.home')}}"
-               class="bar-cell index @if(url($current_url) == route('mobile.home')) active @endif">
-                <div class="b-img"></div>
-                <div class="b-txt font10">首页</div>
-            </a>
             <a href="{{route('mobile.active.spring',['type'=>1])}}"
                class="bar-cell job @if(strripos( url($current_url), route('mobile.jobs')) !== false) active @endif">
                 <div class="b-img"></div>
                 <div class="b-txt font10">新春招聘会</div>
             </a>
+            <a href="{{route('mobile.home')}}"
+               class="bar-cell index @if(url($current_url) == route('mobile.home')) active @endif">
+                <div class="b-img"></div>
+                <div class="b-txt font10">首页</div>
+            </a>
             <a href="{{ route('mobile.person.index') }}"
                class="bar-cell mine @if(strripos( url($current_url), route('mobile.person.index')) !== false) active @endif">
                 <div class="b-img"></div>