Merge remote-tracking branch 'origin/master'

app/Admin/Controllers/System/HotwordController.php

@@ -89,8 +89,10 @@ class HotwordController extends Controller
                 return '企业搜索';
             } elseif ($this->type == '3') {
                 return '个人简历搜索';
-            } else {
+            } elseif ($this->type == '1') {
                 return '职位搜索';
+            } else {
+                return '资讯搜索';
             }
         });
         $grid->w_hot('搜索次数')->width(200);
@@ -107,6 +109,11 @@ class HotwordController extends Controller
             $actions->disableView();
         });
 
+        $grid->filter(function ($filter) {
+            $type_option = ['' => '不限', '1' => '职位搜索', '2' => '企业搜索', '3' => '个人简历搜索', '4' => '资讯搜索'];
+            $filter->equal('type', '类型')->select($type_option)->default('');
+        });
+
         if (Admin::user()->can('system_hotword_delete')) {
             $grid->tools(function ($tools) {
                 $tools->batch(function ($batch) {
@@ -139,8 +146,10 @@ class HotwordController extends Controller
                 return '企业搜索';
             } elseif ($type == 3) {
                 return '个人简历搜索';
-            } else {
+            } elseif ($type == 1) {
                 return '职位搜索';
+            } else {
+                return '资讯搜索';
             }
         });
         $show->w_hot('搜索次数');
@@ -177,10 +186,10 @@ class HotwordController extends Controller
             'required',
         ])->setWidth(3)->setMustMark();
         //搜索类型
-        $type_arr = ['1'=>'职位搜索','2'=>'企业搜索','3'=>'个人简历搜索'];
+        $type_arr = ['1' => '职位搜索', '2' => '企业搜索', '3' => '个人简历搜索', '4' => '资讯搜索'];
         $form->select('type', '搜索类型')
             ->options($type_arr)
-            ->rules('required', array('required'=>'请选择搜索类型。'))
+            ->rules('required', ['required' => '请选择搜索类型。'])
             ->setWidth(3)
             ->setMustMark();
         $form->number('w_hot', '搜索次数')->min(0)->default(0);
@@ -195,17 +204,17 @@ class HotwordController extends Controller
             'required',
         ])->setWidth(3)->setMustMark();
         //搜索类型
-        $type_arr = ['1'=>'职位搜索','2'=>'企业搜索','3'=>'个人简历搜索'];
+        $type_arr = ['1' => '职位搜索', '2' => '企业搜索', '3' => '个人简历搜索', '4' => '资讯搜索'];
         $form->select('type', '搜索类型')
-             ->options($type_arr)
-             ->default(key($type_arr))
-             ->rules('required', array('required'=>'请选择搜索类型。'))
-             ->setWidth(3)
-             ->setMustMark();
+            ->options($type_arr)
+            ->default(key($type_arr))
+            ->rules('required', ['required' => '请选择搜索类型。'])
+            ->setWidth(3)
+            ->setMustMark();
 
         $form->number('w_hot', '搜索次数')->min(0)->default(0);
         $form->number('list_order', '显示排序')->min(0)->default(0)->help('（越大越靠前）');
-       
+
         return $form;
     }
 
@@ -218,6 +227,7 @@ class HotwordController extends Controller
     {
         return $this->createForm()->store();
     }
+
     /**
      * Update the specified resource in storage.
      *

app/Http/Controllers/Mobile/HomeController.php

@@ -155,7 +155,7 @@ class HomeController extends MobileBaseController
         $articles2_map = [
             'type_id'  => [58],
             'limit'    => 8,
-            'titlelen' => 25,
+            'titlelen' => 15,
             'dot'      => '...',
         ];
         $articles2     = $this->articleService->getArticleCache($articles2_map, 'home');

app/Http/Controllers/Web/Auth/RegisterController.php

@@ -14,6 +14,7 @@ use App\Services\Common\TaskService;
 use App\Validators\RegisterValidatorRequest;
 use Closure;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 
 class RegisterController extends WebBaseController
 {
@@ -39,7 +40,7 @@ class RegisterController extends WebBaseController
      * @var AuthService
      */
     private $authService;
-
+    private $qrcode;
 
     /**
      * RegisterController constructor.
@@ -68,6 +69,7 @@ class RegisterController extends WebBaseController
         });
         $this->emailService = $emailService;
         $this->authService  = $authService;
+        $this->qrcode       = DB::table('configs')->where('alias', '=', 'register_qrcode')->value('value');
     }
 
     public function registerIndex()
@@ -77,17 +79,17 @@ class RegisterController extends WebBaseController
 
     public function registerCompany()
     {
-        return view('app.auth.register_company', ['title' => '企业会员注册']);
+        return view('app.auth.register_company', ['title' => '企业会员注册', 'qrcode' => $this->qrcode]);
     }
 
     public function registerPerson()
     {
-        return view('app.auth.register_person', ['title' => '个人会员注册']);
+        return view('app.auth.register_person', ['title' => '个人会员注册', 'qrcode' => $this->qrcode]);
     }
 
     public function registerOrg()
     {
-        return view('app.auth.register_org', ['title' => '机构会员注册']);
+        return view('app.auth.register_org', ['title' => '机构会员注册', 'qrcode' => $this->qrcode]);
     }
 
     public function showSendEmail($type)

app/Http/Controllers/Web/Content/ArticleController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Web\Content;
 
 use App\Http\Controllers\Web\WebBaseController;
+use App\Services\Common\HotWordService;
 use App\Services\Content\ArticleService;
 use App\Services\Content\ArticleCategoryService;
 use App\Services\Content\AdService;
@@ -18,18 +19,20 @@ class ArticleController extends WebBaseController
     protected $articleCategoryService;
     protected $adService;
     protected $navigationService;
+    protected $hotWordService;
 
     /**
      * ArticleController constructor.
      * @param $articleService
      * @param $articleCategoryService
      */
-    public function __construct(ArticleService $articleService, ArticleCategoryService $articleCategoryService, AdService $adService, NavigationService $navigationService)
+    public function __construct(ArticleService $articleService, ArticleCategoryService $articleCategoryService, AdService $adService, NavigationService $navigationService, HotWordService $hotWordService)
     {
         $this->articleService         = $articleService;
         $this->articleCategoryService = $articleCategoryService;
         $this->adService              = $adService;
         $this->navigationService      = $navigationService;
+        $this->hotWordService         = $hotWordService;
     }
 
     public function index(Request $request, $id = '57', $num = '8', $focus = '3', $recommend = '4', $other_num = '5')
@@ -93,6 +96,11 @@ class ArticleController extends WebBaseController
         $recommend_articles = $this->articleService->getPropertyArticles($recommend, $other_num); //推荐资讯
         $bread              = $this->articleCategoryService->getBread($info['id']);
 
+        //搜索关键字
+        if ($key) {
+            $this->hotWordService->searchHostWords($key, 4);
+        }
+
         //获取后台职场资讯名称
         $where        = [
             'alias'     => 'AIX_top',
@@ -110,6 +118,9 @@ class ArticleController extends WebBaseController
         }
         $this->putSeoData('article_cate', $article_cate);
 
+        //热词
+        $hotWords = $this->hotWordService->getHotWords(['type' => 4], 'list_order desc,w_hot desc', 10);    //热门关键词
+
         $return_data = [
             'articles'           => $lists,
             'categorys'          => $categorys,
@@ -121,6 +132,7 @@ class ArticleController extends WebBaseController
             'now_cate'           => $now_cate,
             'categorys_child'    => $categorys_child,
             'bread'              => $bread,
+            'hotwords'           => $hotWords,
         ];
 
         return view('app.content.article.list', $return_data);

app/Http/Kernel.php

@@ -38,7 +38,7 @@ class Kernel extends HttpKernel
             \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
+//            \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \App\Http\Middleware\SystemCheck::class,
             \App\Http\Middleware\GetSeoInfo::class,

app/Services/Common/HotWordService.php

@@ -5,10 +5,12 @@
  * Date: 2018/12/4
  * Time: 10:23
  */
+
 namespace App\Services\Common;
 
 use App\Repositories\HotWordRepository;
 use App\Repositories\MemberHotwordRepository;
+
 //use Illuminate\Support\Facades\Cache;
 
 class HotWordService
@@ -22,55 +24,63 @@ class HotWordService
      */
     public function __construct(HotWordRepository $hotWordRepository, MemberHotwordRepository $memberHotwordRepository)
     {
-        $this->hotWordRepository = $hotWordRepository;
+        $this->hotWordRepository       = $hotWordRepository;
         $this->memberHotwordRepository = $memberHotwordRepository;
     }
+
     public function getHotWord($key, $type = 1)
     {
-        $where[] = array(
-            'w_word', 'like', '%'.$key.'%',
-        );
-        $where[] = array('type','=',$type);
-        $order = 'list_order desc,w_hot desc';
-        $lists = $this->hotWordRepository->getHotWords($where, $order);
+        $where[] = [
+            'w_word', 'like', '%' . $key . '%',
+        ];
+        $where[] = ['type', '=', $type];
+        $order   = 'list_order desc,w_hot desc';
+        $lists   = $this->hotWordRepository->getHotWords($where, $order);
         //修改热门关键字记录
         $word_rst = $this->hotWordRepository->setInc($key, $type);
         if ($lists->toArray()) {
-            return array('key'=>$key,'list'=>$lists);
+            return ['key' => $key, 'list' => $lists];
         }
         return false;
     }
+
     public function setMemberHotword($key, $type = 1)
     {
-        $user = array(
+        $user = [
             'utype' => 0,
-            'uid'   => 0
-        );
+            'uid'   => 0,
+        ];
         if (auth('web-member')->check()) {
-            $user = array(
+            $user = [
                 'utype' => 2,
-                'uid'   => auth('web-member')->user()->id
-            );
+                'uid'   => auth('web-member')->user()->id,
+            ];
         } elseif (auth('web-company')->check()) {
-            $user = array(
+            $user = [
                 'utype' => 1,
-                'uid'   => auth('web-company')->user()->id
-            );
+                'uid'   => auth('web-company')->user()->id,
+            ];
         }
-        $where[] = array('w_word', 'like', '%'.$key.'%',);
-        $where[] = array('type','=',$type);
-        $where[] = array('utype','=',$user['utype']);
-        $where[] = array('uid','=',$user['uid']);
-        $order = 'list_order desc,w_hot desc';
-        $lists = $this->memberHotwordRepository->getHotWords($where, $order);
+        $where[] = ['w_word', 'like', '%' . $key . '%',];
+        $where[] = ['type', '=', $type];
+        $where[] = ['utype', '=', $user['utype']];
+        $where[] = ['uid', '=', $user['uid']];
+        $order   = 'list_order desc,w_hot desc';
+        $lists   = $this->memberHotwordRepository->getHotWords($where, $order);
         //修改热门关键字记录
         $word_rst = $this->memberHotwordRepository->setInc($key, $type, $user);
         if ($lists->toArray()) {
-            return array('key'=>$key,'list'=>$lists);
+            return ['key' => $key, 'list' => $lists];
         }
     }
-    public function getHotWords($where = array (), $order = 'w_hot desc', $limit = '')
+
+    public function getHotWords($where = [], $order = 'w_hot desc', $limit = '')
     {
         return $this->hotWordRepository->getHotWords($where, $order, $limit);
     }
+
+    public function searchHostWords($key, $type = 1)
+    {
+        $this->hotWordRepository->setInc($key, $type);
+    }
 }

app/Services/Content/ArticleService.php

@@ -149,7 +149,8 @@ class ArticleService
     }
     public function getArticleCache($params, $type = 'home')
     {
-        $lists = Cache::get('article_index_list_'.$type.'_'.get_subsite_id());
+//        $lists = Cache::get('article_index_list_'.$type.'_'.get_subsite_id());
+        $lists = null;
         if ($lists === null) {
             //获取指定分类的资讯信息
             $where = array(
@@ -196,7 +197,7 @@ class ArticleService
                     }
                 }
             }
-            Cache::put('article_index_list_'.$type.'_'.get_subsite_id(), $lists, '1800');
+//            Cache::put('article_index_list_'.$type.'_'.get_subsite_id(), $lists, '1800');
         }
         return $lists;
     }

public/themes/default/assets/app/css/article/article.css

@@ -161,6 +161,8 @@
 .new-se-group .new-se-main .ip-group{margin:0 auto;background:#FFF;height:45px;width:770px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;*zoom:1;}
 .new-se-group .new-se-main .ip-box{float:left;padding-top:7px;width:626px;padding-left:17px;*zoom:1;}
 .new-se-main .ip-box input{width:616px;height:28px;line-height:36px;border:0px;}
+.new-se-main .hotword{margin: 15px auto 0 auto;color: #ffffff;overflow: hidden;width: 770px;}
+.new-se-main .hotword a{color:#ffffff;padding-right: 15px;}
 .new-se-group .new-se-main .ip-btn{float:left;width:127px;height:45px;}
 .new-se-main .ip-btn input{background-color:#1d7ad9;font-size:18px;text-align:center;width:127px;height:45px;line-height:45px;border:0px;color:#FFFFFF;cursor:pointer;border-radius:0px 3px 3px 0px;}
 .new-se-main .ip-btn input.hover{background:#1d7ad9;}

public/themes/default/assets/app/js/members/jquery.validate.regcompany.js

@@ -181,7 +181,8 @@
                 landline_tel_num += '-' + landlinelastValue;
             }
             $('#landline_tel').val(landline_tel_num);
-            $('#verifyRegCompany').click();
+            // $('#verifyRegCompany').click();
+            regCompanyHandler();
             // if (config_varify_reg) {// 开启注册验证
             //     if (verifyPhoto) {// 图形验证码
             //         verifyPhotoDialog();
@@ -378,7 +379,7 @@
     });
 
     // 如果后台开启注册验证就配置极验
-        var handler = function(captchaObj) {
+        /*var handler = function(captchaObj) {
             captchaObj.bindForm("#registerForm");
             captchaObj.onSuccess(function() {
                 regCompanyHandler();
@@ -391,6 +392,6 @@
 
             });
         };
-        gt_init(handler);
+        gt_init(handler);*/
 
 })(jQuery);

public/themes/default/views/app/auth/register_company.blade.php

@@ -111,10 +111,12 @@
             <!-- -->
 
             <div class="rr">
-            	<a href="{{route('home')}}" class="gohome">返回首页</a>
-                <div id="thirdlogin-wechat-web" class="webchat-login-code"></div>
+                <a href="{{route('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('login.company')}}" class="J_hoverbut btn_blue btn_inline">直接登录</a></div>

public/themes/default/views/app/auth/register_org.blade.php

@@ -111,9 +111,11 @@
 
             <div class="rr">
                 <a href="{{route('home')}}" class="gohome">返回首页</a>
-                <div id="thirdlogin-wechat-web" class="webchat-login-code"></div>
+                {{--<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('login.org')}}" class="J_hoverbut btn_blue btn_inline">直接登录</a></div>

public/themes/default/views/app/auth/register_person.blade.php

@@ -249,9 +249,11 @@
         </div>
         <div class="rr">
         	<a href="{{route('home')}}" class="gohome">返回首页</a>
-            <div id="thirdlogin-wechat-web" class="webchat-login-code"></div>
+            {{--<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('login')}}" class=" J_hoverbut btn_blue btn_inline">直接登录</a></div>
@@ -272,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')

public/themes/default/views/app/content/article/list.blade.php

@@ -24,6 +24,15 @@
                     <div class="clear"></div>
                 </div>
             </form>
+
+            @if($hotwords)
+                <div class="hotword link_gray9 font_gray9 nowrap" id="job_hotword">
+                    热门关键字：
+                    @foreach($hotwords as $k => $v)
+                        <a href='{{route('news.list',['id'=>$type_id])}}?key={{$v["w_word"]}}'>{{$v['w_word']}}</a>
+                    @endforeach
+                </div>
+            @endif
         </div>
     </div>
 

public/themes/default/views/app/content/policy/index.blade.php

@@ -102,6 +102,7 @@
             </div>
         </div>
         <div class="r">
+            <img src="{{ theme_asset('app/images/talent_card/policy_cacl.png') }}" style="width:100%;display:block;">
             {{-- 省级政策 --}}
             @if($focus_articles->toArray())
                 <div class="listbox">

public/themes/default/views/app/content/policy/list.blade.php

@@ -107,8 +107,9 @@
             </div>
         </div>
         <div class="r">
+            <img src="{{ theme_asset('app/images/talent_card/policy_cacl.png') }}" style="width:100%;display:block;">
             {{-- 省级政策 --}}
-            <div class="listbox" style="margin-top:0px;">
+            <div class="listbox">
                 <div class="ntit"><div class="tlh">省级政策</div></div>
                 <ul class="link_gray6">
                     @if($focus_articles->toArray())

public/themes/default/views/mobile/app/auth/login.blade.php

@@ -75,10 +75,10 @@
 
                 });
                 captchaObj.onError(function () {
-                    qsToast({type:2,context: "请先进行验证"});
+                    // qsToast({type:2,context: "请先进行验证"});
                 });
                 captchaObj.onClose(function () {
-                    qsToast({type:2,context: "请先进行验证"});
+                    // qsToast({type:2,context: "请先进行验证"});
                 });
                 $('.login-account').on('click', function () {
                     var usernameValue = $.trim($('input[name=account]').val());

public/themes/default/views/mobile/app/auth/register_company.blade.php

@@ -335,7 +335,105 @@
 
         });
     };
-    gt_init(handler);
+    // gt_init(handler);
+
+    $('#btnRegCompany').on('click', function () {
+        var comnameValue = $.trim($('input[name="companyname"]').val());
+        var contactValue = $.trim($('input[name="contact"]').val());
+        var telephoneValue = $.trim($('input[name="company_mobile"]').val());
+        var landlineValue = $.trim($('#landline_tel').val());
+        var usernameValue = $.trim($('input[name="username"]').val());
+        var emailValue = $.trim($('input[name="email"]').val());
+        var emailpassword = $.trim($('input[name="company_password"]').val());
+        var emailpasswordVerify = $.trim($('input[name="company_password_confirmation"]').val());
+        var agreementValue = $('input[name=agreement]').val();
+        if(!comnameValue){
+            qsToast({type:2,context: '请填写公司名称'});
+            return false;
+        }
+        if(!remoteValid('companyname',comnameValue)){
+            qsToast({type:2,context: '该公司已被注册'});
+            return false;
+        }
+        if(!contactValue){
+            qsToast({type:2,context: '请填写联系人'});
+            return false;
+        }
+
+        if(!telephoneValue && !landlineValue){
+            qsToast({type:2,context: '公司座机和手机号码至少填写一项'});
+            return false;
+        }else if(telephoneValue && !landlineValue){
+            if(!inputRegValiMobile(telephoneValue)){
+                qsToast({type:2,context: '手机号格式错误'});
+                return false;
+            }
+            if(!remoteValid('mobile',telephoneValue)){
+                qsToast({type:2,context: '该手机号已被注册'});
+                return false;
+            }
+        }else if(telephoneValue && landlineValue){
+            if(!inputRegValiMobile(telephoneValue)){
+                qsToast({type:2,context: '手机号格式错误'});
+                return false;
+            }
+            if(!remoteValid('mobile',telephoneValue)){
+                qsToast({type:2,context: '该手机号已被注册'});
+                return false;
+            }
+        }
+
+        if(!usernameValue){
+            qsToast({type:2,context: '请填写用户名'});
+            return false;
+        }
+        if(!inputRegValiUsername(usernameValue)){
+            qsToast({type:2,context: '用户名字母开头,包含6位以上数字和字母'});
+            return false;
+        }
+        if(!remoteValid('username',usernameValue)){
+            qsToast({type:2,context: '该用户名已被注册'});
+            return false;
+        }
+        if(!emailValue){
+            qsToast({type:2,context: '请填写邮箱'});
+            return false;
+        }
+        if(!inputRegValiEmail(emailValue)){
+            qsToast({type:2,context: '邮箱格式错误'});
+            return false;
+        }
+        if(!remoteValid('email',emailValue)){
+            qsToast({type:2,context: '该邮箱已被注册'});
+            return false;
+        }
+        if(!emailpassword){
+            qsToast({type:2,context: '请填写密码'});
+            return false;
+        }
+        if(!inputRegValiPassword(emailpassword)){
+            qsToast({type:2,context: '密码长度要求为6-16个字符'});
+            return false;
+        }
+        if(!emailpasswordVerify){
+            qsToast({type:2,context: '请填写确认密码'});
+            return false;
+        }
+        if(!inputRegValiPassword(emailpasswordVerify)){
+            qsToast({type:2,context: '密码长度要求为6-16个字符'});
+            return false;
+        }
+        if(!inputRegValiPasswordRepeat(emailpassword,emailpasswordVerify)){
+            qsToast({type:2,context: '两次输入的密码不一致'});
+            return false;
+        }
+        if (agreementValue !=1) {
+            qsToast({type:2,context: '请接受用户服务协议'});
+            return false;
+        }
+        regCompanyHandler();
+
+    });
 
     // 注册企业处理程序
     function regCompanyHandler() {

public/themes/default/views/mobile/app/auth/register_person.blade.php

@@ -49,7 +49,7 @@
             </div>
             <div class="talent-form" style="display:none;">
                 <div class="group-list">
-                    <input id="password_confirmation" name="realname" class="l-input font14" placeholder="请输入真实姓名" autocomplete="off">
+                    <input id="realname" name="realname" class="l-input font14" placeholder="请输入真实姓名" autocomplete="off">
                 </div>
                 <div class="group-list">
                     <select name="card_t_cn" id="card_t_cn" class="l-input font14">
@@ -59,7 +59,7 @@
                     </select>
                 </div>
                 <div class="group-list">
-                    <input id="password_confirmation" name="id_card" class="l-input font14" placeholder="请输入证件号" autocomplete="off">
+                    <input id="id_card" name="id_card" class="l-input font14" placeholder="请输入证件号" autocomplete="off">
                 </div>
             </div>
         </div>
@@ -133,60 +133,6 @@
             });
             captchaObj.onError(function() {
 
-            });
-            $('#btnRegPersonal').on('click', function () {
-                // var id_cardValue = $.trim($('input[name=id_card]').val());
-                var mobileValue = $.trim($('input[name=mobile]').val());
-                var verifycodeValue = $.trim($('input[name=mobile_vcode]').val());
-                var passwordValue = $.trim($('input[name=password]').val());
-                var password_confirmation = $.trim($('input[name=password_confirmation]').val());
-                var agreementValue = $('input[name=agreement]').val();
-                /*if (id_cardValue == '') {
-                    qsToast({type:2,context: '请输入身份证号码'});
-                    return false;
-                }
-                if(!IsCardVali('id_card',id_cardValue)) {
-                    qsToast({type:2,context: '身份证格式错误'});
-                    return false;
-                }
-                if(!IsCard('id_card',id_cardValue)) {
-                    qsToast({type:2,context: '该身份证已被注册'});
-                    return false;
-                }*/
-                if (mobileValue == '') {
-                    qsToast({type:2,context: '请输入手机号码'});
-                    return false;
-                }
-                if (mobileValue != "" && !regularMobile.test(mobileValue)) {
-                    qsToast({type:2,context: '手机号码格式不正确'});
-                    return false;
-                }
-                if (verifycodeValue == '') {
-                    qsToast({type:2,context: '请输入手机验证码'});
-                    return false;
-                }
-                if (passwordValue == '') {
-                    qsToast({type:2,context: '请输入账户密码'});
-                    return false;
-                }
-                if(!inputRegValiPassword(passwordValue)){
-                    qsToast({type:2,context: '密码长度要求为6-16个字符'});
-                    return false;
-                }
-                if (password_confirmation == '') {
-                    qsToast({type:2,context: '请确认账户密码'});
-                    return false;
-                }
-                if (passwordValue != password_confirmation) {
-                    qsToast({type:2,context: '两次输入的密码不一致'});
-                    return false;
-                }
-                if (agreementValue !=1) {
-                    qsToast({type:2,context: '请接受用户服务协议'});
-                    return false;
-                }
-                captchaObj.verify();
-
             });
         };
 
@@ -227,6 +173,61 @@
         // gt_init(handler);
     }
 
+    $('#btnRegPersonal').on('click', function () {
+        // var id_cardValue = $.trim($('input[name=id_card]').val());
+        var mobileValue = $.trim($('input[name=mobile]').val());
+        var verifycodeValue = $.trim($('input[name=mobile_vcode]').val());
+        var passwordValue = $.trim($('input[name=password]').val());
+        var password_confirmation = $.trim($('input[name=password_confirmation]').val());
+        var agreementValue = $('input[name=agreement]').val();
+        /*if (id_cardValue == '') {
+            qsToast({type:2,context: '请输入身份证号码'});
+            return false;
+        }
+        if(!IsCardVali('id_card',id_cardValue)) {
+            qsToast({type:2,context: '身份证格式错误'});
+            return false;
+        }
+        if(!IsCard('id_card',id_cardValue)) {
+            qsToast({type:2,context: '该身份证已被注册'});
+            return false;
+        }*/
+        if (mobileValue == '') {
+            qsToast({type:2,context: '请输入手机号码'});
+            return false;
+        }
+        if (mobileValue != "" && !regularMobile.test(mobileValue)) {
+            qsToast({type:2,context: '手机号码格式不正确'});
+            return false;
+        }
+        if (verifycodeValue == '') {
+            qsToast({type:2,context: '请输入手机验证码'});
+            return false;
+        }
+        if (passwordValue == '') {
+            qsToast({type:2,context: '请输入账户密码'});
+            return false;
+        }
+        if(!inputRegValiPassword(passwordValue)){
+            qsToast({type:2,context: '密码长度要求为6-16个字符'});
+            return false;
+        }
+        if (password_confirmation == '') {
+            qsToast({type:2,context: '请确认账户密码'});
+            return false;
+        }
+        if (passwordValue != password_confirmation) {
+            qsToast({type:2,context: '两次输入的密码不一致'});
+            return false;
+        }
+        if (agreementValue !=1) {
+            qsToast({type:2,context: '请接受用户服务协议'});
+            return false;
+        }
+
+        regPerByMobileHandler();
+
+    });
 
     $('input[name=mobile]').change(function () {
         var currentValue = $(this).val();

public/themes/default/views/mobile/app/index.blade.php

@@ -129,7 +129,7 @@
                     @else
                         <a href="{{route('mobile.login')}}"><dl class="l1"><dt class="fabu for-event"></dt><dd class="font12">我要发布</dd></dl></a>
                     @endif
-                    <a href="{{route('mobile.notice')}}"><dl class="l1"><dt class="notice"></dt><dd class="font12 for-event">公告</dd></dl></a>
+                    <a href="{{route($sub_site."mobile.news.list",['id'=>57])}}"><dl class="l1"><dt class="notice"></dt><dd class="font12 for-event">公告</dd></dl></a>
 {{--                    <a href="{{ route('mobile.jobfair.index') }}"><dl class="l1"><dt class="zhaoph"></dt><dd class="font12 for-event">招聘会</dd></dl></a>--}}
                     <div class="clear"></div>
                 </li>
@@ -282,7 +282,7 @@
                             @endif
                         </li>
                     @endforeach
-                        <div onclick="window.location='{{route($sub_site."mobile.news.list",['id'=>3])}}';" style="text-align:center;height:.8rem;line-height:.8rem;background:#fff;">查看更多</div>
+                        <div onclick="window.location='{{route($sub_site."mobile.news.list",['id'=>59])}}';" style="text-align:center;height:.8rem;line-height:.8rem;background:#fff;">查看更多</div>
                 @else
                     <div style="text-align:center;height:.8rem;line-height:.8rem;background:#fff;">暂无动态</div>
                 @endif
@@ -293,9 +293,14 @@
                 @if(array_has($articles2, '58') && $articles2['58'])
                     @foreach($articles2['58'] as $k=>$v)
                         <li>
-                            <a href="{{route('mobile.news.show',['id'=>$v->id])}}" target="_blank" rel="nofollow noopener noreferrer"><b class="b2"></b>{{cut_str($v->title, 25, 0, '...')}}</a>
+                            @if(empty($v->is_url))
+                                <a href="{{route('mobile.news.show',['id'=>$v->id])}}" target="_blank" rel="nofollow noopener noreferrer"><b>&gt;</b>{{cut_str($v->title, 15, 0, '...')}}<span class="jc_rt">{{date('Y-m-d',strtotime($v->created_at))}}</span></a>
+                            @else
+                                <a href="{{$v->is_url}}" target="_blank" rel="nofollow noopener noreferrer"><b>&gt;</b>{{cut_str($v->title, 15, 0, '...')}}<span class="jc_rt">{{date('Y-m-d',strtotime($v->created_at))}}</span></a>
+                            @endif
                         </li>
                     @endforeach
+                        <div onclick="window.location='{{route($sub_site."mobile.news.list",['id'=>58])}}';" style="text-align:center;height:.8rem;line-height:.8rem;background:#fff;">查看更多</div>
                 @else
                     <div style="text-align:center;height:.8rem;line-height:.8rem;background:#fff;">暂无动态</div>
                 @endif