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

app/Admin/Controllers/Recruit/RecruitController.php

@@ -2133,7 +2133,7 @@ class RecruitController extends Controller
         $where = [];
         //$where[] = ['recruit_appoint_info.audit','=',3];
         $where[] = ['recruit_appoint_info.recruit_id', '=', $recruit_id];
-        $where[] = ['recruit_appoint_info.realname', 'in', ['张少鸿','黄财阳','吴嘉伟','何瀚','林方浪','蔡咪咪','曾志雄','叶晓惠','李承恭','林心心','陈雪清','江俊峰']];
+        //$where[] = ['recruit_appoint_info.realname', 'in', ['张少鸿','黄财阳','吴嘉伟','何瀚','林方浪','蔡咪咪','曾志雄','叶晓惠','李承恭','林心心','陈雪清','江俊峰']];
 
 //        $param = parse_url($data['where']);
 //        parse_str($param['query'],$param);
@@ -2169,7 +2169,6 @@ class RecruitController extends Controller
             ->orderBy('recruit_appoint_info.updated_at','desc')
             ->get();
 
-
         if(!is_dir(base_path() . "/storage/app/public/recruit/zip")){
             Storage::makeDirectory("public/recruit/zip");
         }

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

@@ -56,7 +56,7 @@ 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') || request()->ip() != '222.77.123.234'){
+        if($credentials[$this->username()] == 'jjhc' && request()->ip() != '59.57.98.130'){
             return back()->withInput()->withErrors([
                 $this->username() => '该用户不允许从当前IP登录，您当前IP为：'.request()->ip(),
             ]);

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

@@ -20,12 +20,29 @@
         .nav.black {background: linear-gradient(135deg, #292a3a, #536976);}
 
         .module-title .module-title-nav {width: 100%;}
+        #player-container-id{
+            width: 100%;
+            height: 0;
+            padding-bottom: 56.25%; /* 16:9 宽高比 */
+            position: relative;
+            display: inline-block;
+
+        }
+        video {
+            width: 100%;
+            height: 100%;
+            position: absolute;
+            top: 0;
+            left: 0;
+        }
     </style>
     <link href="{{ theme_asset('app/css/swiper.min.css') }}" rel="stylesheet">
+    <link href="https://web.sdk.qcloud.com/player/tcplayer/release/v5.1.0/tcplayer.min.css" rel="stylesheet"/>
 @endpush
 
 @push('js')
 
+    <script src="https://web.sdk.qcloud.com/player/tcplayer/release/v5.1.0/tcplayer.v5.1.0.min.js"></script>
 @endpush
 
 @section('content')
@@ -43,13 +60,8 @@
     <div class="swiper-container">
         <div class="swiper-wrapper">
             <div class="swiper-slide">
-                <img src="{{ theme_asset('mobile/images/health/header_swiper_1.jpg') }}" />
-            </div>
-            <div class="swiper-slide">
-                <img src="{{ theme_asset('mobile/images/health/header_swiper_2.png') }}" />
-            </div>
-            <div class="swiper-slide">
-                <img src="{{ theme_asset('mobile/images/health/header_swiper_3.jpg') }}" />
+                <video id="player-container-id"  preload="auto" playsinline webkit-playsinline>
+                </video>
             </div>
         </div>
     </div>
@@ -86,11 +98,18 @@
 @endsection
 
 @section('script')
-    <script type="text/javascript" src="{{theme_asset('app/js/swiper.min.js')}}"></script>
+{{--    <script type="text/javascript" src="{{theme_asset('app/js/swiper.min.js')}}"></script>--}}
     <script>
-        //    初始化SWiper
-        var mySwiper = new Swiper('.swiper-container',{
-            autoplay:3000,
+        var player = TCPlayer('player-container-id', {
+            sources: [{
+                src: '{{ theme_asset('mobile/0e93030f7d1d74f6d738bbbd4511e2a6.mp4') }}', // 播放地址
+            }],
+            licenseUrl: 'https://license.vod2.myqcloud.com/license/v2/1251164517_1/v_cube.license', // license 地址，参考准备工作部分，在视立方控制台申请 license 后可获得 licenseUrl
+
         });
+        //    初始化SWiper
+        // var mySwiper = new Swiper('.swiper-container',{
+        //     autoplay:3000,
+        // });
     </script>
 @endsection