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

app/Http/Controllers/Mobile/Auth/LoginController.php

@@ -171,16 +171,15 @@ class LoginController extends MobileBaseController
 //                config('aix.system.site_safety.site_vo_code.members_login')
 //            );
             $redis                   = Cache::getRedis();
-            $value                   = $redis->get('user_' . $request->account);
-            //dd($value);
+            $value                   = $redis->get('user_' . $request->company_account);
             if (!$value) {
                 $value = 0;
             }
             if ($value >= 5) {
-                $redis->expire('user_' . $request->account, 900);
+                $redis->expire('user_' . $request->company_account, 900);
                 return $this->sendErrorResponse("连续登录失败5次，请15分钟后再尝试！");
             }
-            $redis->set('user_' . $request->account, ++$value);
+            $redis->set('user_' . $request->company_account, ++$value);
 
             return $this->sendErrorResponse("账号或密码错误或密码已超过90天未修改，请使用找回密码功能");
         }

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

@@ -328,7 +328,7 @@
                     <tbody>
                     <tr>
                         <td style="line-height: 37px" width="90%">
-                            1.本人是否为曾因犯罪受过刑事处罚或曾被开除公职的人员；
+                            1.本人为现役军人；
                         </td>
                         <td>
                             <input type="checkbox" name="q1" value="1"> 是&nbsp;&nbsp;
@@ -799,14 +799,14 @@
                             border: false,
                             btns: ['打印准考证','取消'],
                             yes: function(){
-                                if($($(".agree_commit1")[1]).prop('checked')){
+                                if($($(".agree_commit")[1]).prop('checked')){
                                     window.location.href = "{!! route('recruit.face_ticket',['recruit_id'=>$recruit->id]) !!}";
                                 }else{
                                     alert('请阅读并承诺遵守《考生报考承诺书》');
                                 }
                             }
                         });
-                        qsDialog.setContent($('#commit1').html());
+                        qsDialog.setContent($('#commit').html());
                             //window.location.href = "{!! route('recruit.face_ticket',['recruit_id'=>$recruit->id,'uid'=>$uid]) !!}";
                         {{--var qsDialog = $(this).dialog({--}}
                         {{--    loading: true,--}}