Merge remote-tracking branch 'origin/master'

app/Http/Controllers/Mobile/Lottery/LotteryController.php

@@ -138,14 +138,15 @@ class LotteryController extends MobileBaseController
     {
         //抽奖次数
         $data = $request->all();
-        $date = date('Y-m-d');
+//        $date = date('Y-m-d');
+        $date = "2025-01-01";
         $log  = LotteryLog::where([
             ['create_time', '=', $date],
             ['type', '=', $data['type']],
             ['open_id', '=', $data['open_id']],
         ])->first();
         if (!empty($log)) {
-            return response()->json(['status' => 0, 'msg' => '您今天已抽过奖，请明天再来！']);
+            return response()->json(['status' => 0, 'msg' => '您已抽过奖！']);
         }
         LotteryLog::create([
             'create_time' => $date,

public/themes/default/assets/mobile/css/online2021.css

@@ -6,7 +6,7 @@ a {text-decoration:none;}
 .online2021_title p {color:#db0b00;font-size:.3rem;text-align:center;padding-top:30px;font-weight:600;letter-spacing:2px;}
 
 .online2021_ad {background-image:url("../images/online2021/bg_ad.jpg");width:100%;height:80px;background-size:100% 100%;position: relative;top: -20px;}
-.online2021_ad p {color:#fac97c;font-size:.29rem;text-align:center;font-weight:600;padding:0 5%;padding-top:15px;height:60px;line-height:25px;}
+.online2021_ad p {color:#fac97c;font-size:.29rem;text-align:center;font-weight:600;padding:0 5%;padding-top:15px;height:60px;line-height:60px;}
 
 .online2021_special ul {display: flex;flex-wrap: wrap;justify-content: space-between;}
 .online2021_special ul a {width:50%;padding:0 2% 20px 2%;display:block;}

public/themes/default/views/mobile/app/active/spring.blade.php

@@ -6,7 +6,7 @@
 
 @push('css')
     <link rel="stylesheet" href="{{theme_asset('mobile/css/news.css')}}">
-    <link rel="stylesheet" href="{{theme_asset('mobile/css/online2021.css')}}?v=4">
+    <link rel="stylesheet" href="{{theme_asset('mobile/css/online2021.css')}}?v=5">
     <link href="{{ theme_asset('mobile/css/lottery.css') }}" rel="stylesheet">
 @endpush
 
@@ -14,16 +14,16 @@
 @endpush
 
 @section('content')
-    <div class="online2021_header">
-        <img src="{{theme_asset('mobile/images/spring/header_2025.png')}}?v=1">
+    <div class="online2021_header" onclick="">
+        <img src="{{theme_asset('mobile/images/spring/header_2025.png')}}?v=2">
     </div>
 
     <div class="online2021_title">
         <p>晋江聚才网线上招聘会大厅</p>
     </div>
-    <div class="online2021_ad">
-        <p>聚才找工作赠好礼助力找工作稳就业。看直播，找工作，近千个岗位，近万份豪礼在线等着您。</p>
-    </div>
+{{--    <div class="online2021_ad">--}}
+{{--        <p>聚才网找工，收获心仪工作奖品。</p>--}}
+{{--    </div>--}}
     <div class="online2021_special">
         <ul>
             <a href="{{route('mobile.active.spring_special')}}">
@@ -92,6 +92,11 @@
                 <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>
@@ -129,9 +134,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>
@@ -187,6 +192,7 @@
                 @endforeach
             </div>
         </div>
+        <a id="lottery"></a>
         @foreach ($images as $k => $v)
             <img src="{{ $v }}" id="gift-img{{$k}}" style="display:none;"/>
         @endforeach
@@ -456,25 +462,30 @@
 
     </script>
     <script>
-        $('.line-two .more').click(function (event) {
-            var company = $(this).data('company').split(',');
-            var str = '';
-            for (var i = 0; i < company.length; i++) {
-                str += '<p>' + company[i] + '</p>'; //分割后的字符输出
-            }
-            layer.open({
-                title: [
-                    '参会企业',
-                    'background-color: #ec0d00; color:#fff;'
-                ]
-                , content: str
-                , btn: '我知道了'
-            });
-            event.stopPropagation();
-        });
-        $('.to_live').click(function () {
-            url = $(this).data('url');
-            location.href = url;
+        // $('.line-two .more').click(function (event) {
+        //     var company = $(this).data('company').split(',');
+        //     var str = '';
+        //     for (var i = 0; i < company.length; i++) {
+        //         str += '<p>' + company[i] + '</p>'; //分割后的字符输出
+        //     }
+        //     layer.open({
+        //         title: [
+        //             '参会企业',
+        //             'background-color: #ec0d00; color:#fff;'
+        //         ]
+        //         , content: str
+        //         , btn: '我知道了'
+        //     });
+        //     event.stopPropagation();
+        // });
+        // $('.to_live').click(function () {
+        //     url = $(this).data('url');
+        //     location.href = url;
+        // });
+        $('.for-event').click(function() {
+            $('html, body').animate({
+                scrollTop: $('#lottery').offset().top
+            }, 'slow');
         });
 
         function showWechat() {

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_2025.png')}}?v=1">
+        <img src="{{theme_asset('mobile/images/spring/header_2025.png')}}?v=2">
     </div>
     <div class="online2021_title">
         <p>{{$title}}</p>

public/themes/default/views/mobile/app/active/spring_special_jkq.blade.php

@@ -71,7 +71,7 @@
 @section('content')
     @if(empty($source))
         <div class="online2021_header">
-            <img src="{{theme_asset('mobile/images/spring/header_2025.png')}}?v=1">
+            <img src="{{theme_asset('mobile/images/spring/header_2025.png')}}?v=2">
         </div>
     @else
         <div class="live_header">
@@ -184,6 +184,7 @@
                 @endforeach
             </div>
         </div>
+        <a id="lottery"></a>
         @foreach ($images as $k => $v)
             <img src="{{ $v }}" id="gift-img{{$k}}" style="display:none;"/>
         @endforeach
@@ -355,7 +356,7 @@
                     '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')}}?v=1" style="width:100%;" />'
             });
         });
         $('.company_order').click(function () {
@@ -366,7 +367,7 @@
                     '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')}}?v=1" style="width:100%;" />'
             });
         });
 
@@ -557,9 +558,15 @@
             });
             event.stopPropagation();
         });
-        $('.to_live').click(function () {
-            url = $(this).data('url');
-            location.href = url;
+        // $('.to_live').click(function () {
+        //     url = $(this).data('url');
+        //     location.href = url;
+        // });
+
+        $('.for-event').click(function() {
+            $('html, body').animate({
+                scrollTop: $('#lottery').offset().top
+            }, 'slow');
         });
 
         function goPage() {

public/themes/default/views/module/section/header_min.blade.php

@@ -54,8 +54,8 @@
 					<li class="per"><i></i><a href="{{route('login')}}">个人登录</a><span>/</span><a href="{{route('register.person')}}" class="register_user">注册</a></li>
 					<li>|</li>
 					<li class="com"><i></i><a href="{{route('login.company')}}">企业登录</a><span>/</span><a href="{{route('register.company')}}" class="register_user">注册</a></li>
-					<li>|</li>
-					<li class="com"><i></i><a href="{{route('login.org')}}">机构登录</a><span>/</span><a href="{{route('register.org')}}" class="register_user">注册</a></li>
+{{--					<li>|</li>--}}
+{{--					<li class="com"><i></i><a href="{{route('login.org')}}">机构登录</a><span>/</span><a href="{{route('register.org')}}" class="register_user">注册</a></li>--}}
 				@endif
 				{{--<li>--}}
 					{{--<a href="/mobile" class="m qr_mobile" target="_blank" rel="nofollow noopener noreferrer">手机访问--}}