Merge remote-tracking branch 'origin/master'

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

@@ -181,7 +181,7 @@ class LotteryController extends MobileBaseController
             $win->save();
         }
 
-        return response()->json(['status' => 1, 'msg' => '恭喜你，获得' . $prize_win->prize_name, 'id' => $rid]);
+        return response()->json(['status' => 1, 'msg' => '恭喜你，获得' . $prize_win->prize_name.'。请点击领奖按钮进行领奖。', 'id' => $rid]);
     }
 
     private function _get_rand($proArr)

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

@@ -71,7 +71,8 @@ a {text-decoration:none;}
 .onine2021_lottery .content_box .cell .time {width:25%;font-size:.2rem;}
 .onine2021_lottery .btn {width:40%;height:27px;line-height:27px;background:#B2001A;color:white;border-radius:5px;text-align:center;margin:0 auto;margin-top: 10px;}
 
-.to_lottery {width:50px;height:50px;position:fixed;bottom:1.5rem;right:20px;line-height:45px;background:#B2001A;text-align:center;border-radius:50%;z-index:999;font-size:.38rem;font-weight:600;color:#FEFDD2;border: 2px solid #eee;}
+.to_lottery {width:50px;height:50px;position:fixed;bottom:130px;right:20px;line-height:45px;background:#B2001A;text-align:center;border-radius:50%;z-index:999;font-size:.38rem;font-weight:600;color:#FEFDD2;border: 2px solid #eee;}
+.to_log {width:50px;height:50px;position:fixed;bottom:70px;right:20px;line-height:45px;background:#B2001A;text-align:center;border-radius:50%;z-index:999;font-size:.38rem;font-weight:600;color:#FEFDD2;border: 2px solid #eee;}
 
 .layui-m-layercont {padding:30px !important;}
 .layui-m-layercont p {line-height:30px;}

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

@@ -253,6 +253,7 @@
         </div>
     </div>
     <a href="javascript:void(0);" class="to_lottery">抽奖</a>
+    <a href="{{route('mobile.person.lottery')}}" class="to_log">领奖</a>
     @include('mobile.module.section.online_footer')
 @endsection
 

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

@@ -321,6 +321,7 @@
 
     @if(empty($source))
         <a href="javascript:void(0);" class="to_lottery">抽奖</a>
+        <a href="{{route('mobile.person.lottery')}}" class="to_log">领奖</a>
     @endif
     @include('mobile.module.section.online_footer')
 @endsection

public/themes/default/views/mobile/app/person/ajax_tpl/ajax_lottery.blade.php

@@ -2,7 +2,7 @@
     <div class="list-item js-longpress for-event">
         <div class="content">
             <div class="line-one">
-                <div class="title substring">{{ $val->prize->prize_name }}</div>
+                <div class="title substring">{{ $val->prize_name }}</div>
                 <div class="right font_red">
                     @if ($val->status == 1)
                         <div>未领奖</div>