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

libs/repositories/laravel-admin/src/Controllers/AuthController.php

@@ -56,11 +56,11 @@ class AuthController extends Controller
         $credentials = $request->only([$this->username(), 'password']);
         $remember = $request->get('remember', false);
 
-        if($credentials[$this->username()] == 'jjhc' && request()->ip() != '59.57.98.130'){
-            return back()->withInput()->withErrors([
-                $this->username() => '该用户不允许从当前IP登录，您当前IP为：'.request()->ip(),
-            ]);
-        }
+//        if($credentials[$this->username()] == 'jjhc' && request()->ip() != '59.57.98.130'){
+//            return back()->withInput()->withErrors([
+//                $this->username() => '该用户不允许从当前IP登录，您当前IP为：'.request()->ip(),
+//            ]);
+//        }
 
         /** @var \Illuminate\Validation\Validator $validator */
         $validator = Validator::make(

public/themes/default/assets/app/css/recruit/apply_show.css

@@ -180,6 +180,8 @@ b {
     border: 1px solid #ccc;
     padding: 20px 20px 30px 10px;
     width: 270px;
+    height: 330px;
+    overflow: scroll;
 }
 
 /*内容*/

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

@@ -81,7 +81,7 @@
                         <li style="background:#ff9900;float: left;margin-bottom:10px;">确认参加笔试</li>
                     </a>
                 @endif
-                @if(in_array(3,explode(',',$recruit->step)))
+                @if(in_array(3,explode(',',$recruit->step)) && $recruit->pen_ticket_type == 1)
                     <a href="javascript:void(0)" id="pen_ticket" data-id="{{$info->id}}" >
                         <li style="background:#ff9900;float: left;margin-bottom:10px;">笔试准考证打印</li>
                     </a>

routes/web.php

@@ -934,6 +934,7 @@ Route::group([
     $router->post('/create_word', 'Web\Talent\JjhcController@create_word')->name('talent.jjhc.create_word');
     $router->post('/coze_callback', 'Web\Talent\JjhcController@callback')->name('talent.jjhc.coze_callback');
     $router->get('/aibot', 'Web\Talent\JjhcController@aibot')->name('talent.jjhc.aibot');
+    $router->post('/generateExcel', 'Web\Talent\JjhcController@generateExcel')->name('talent.jjhc.generateExcel');
 });
 
 Route::group([