异常处理

app/Http/Controllers/Admin/RegulationController.php

@@ -15,7 +15,7 @@ class RegulationController extends Controller
 {
 //    private $token='so5j3C150405826059a61b94de9df';
     /**
-     * @return 加款扣款
+     * @return 加款扣款1
      */
     function index()
     {
@@ -24,12 +24,12 @@ class RegulationController extends Controller
         $dt = \App\Lib\DataTable\DataTable::init ();
         $dt->setDataSource ('/admin/money/getUser');
         $dt->setLang ('money');
-        $dt->addColsFields ('id', array('width' => 100));
-        $dt->addColsFields ('account_name', array('templet' => '#userRegulation', 'width' => 140));
-        $dt->addColsFields ('cash', array('width' => 120));
+        $dt->addColsFields ('id', array('sort' => false,'width' => 100));
+        $dt->addColsFields ('account_name', array('sort' => false,'templet' => '#userRegulation', 'width' => 140));
+        $dt->addColsFields ('cash', array('sort' => false,'width' => 120));
 //		$dt->addColsFields('add_money');
-        $dt->addColsFields ('add_money', array('sort' => false, 'templet' => '#add_money'));
-        $dt->addColsFields ('cut_money', array('sort' => false, 'templet' => '#cut_money'));
+        // $dt->addColsFields ('add_money', array('sort' => false, 'templet' => '#add_money'));
+        // $dt->addColsFields ('cut_money', array('sort' => false, 'templet' => '#cut_money'));
 //		$dt->addColsFields('takeoff_money');
 //		$dt->setToolBar(array('add','cut'));
         return view ('admin.Regulation/index', $dt->render ($request));

app/Http/Controllers/Admin/SportsbqController.php

@@ -276,6 +276,7 @@ class SportsbqController extends Controller {
                 'match_id' => $match_id,
                 'match_score_t' => json_encode($uscore),
                 'user_id' => session('adminInfo.admin_id'),
+                'type' => 1,
                 'create_at' => now()
             ]);
         }
@@ -310,7 +311,7 @@ class SportsbqController extends Controller {
         $lastLog = \App\Models\Stbqresultlog::where([
             ['match_id', $match_id],
             ['type', 2]
-        ])->orderBy('id', 'desc')->first();
+        ])->orderBy('id', 'asc')->first();
 
         if(empty($lastLog) || !(
             $lastLog['u_home_score'] == $data['u_home_score']

app/Http/Controllers/Admin/SportswqController.php

@@ -207,6 +207,21 @@ class SportswqController extends Controller {
 		return $array;
 	}
 
+    //查询赛事结果
+    function resultLog(Req $req){
+        $match_id = $req->match_id;
+        $list = \App\Models\Stwqresultlog::leftJoin('system_user', 'user_id', '=', 'system_user.id')
+            ->select('st_wq_result_log.*', 'system_user.loginname')->where('match_id', $match_id)->orderBy('id', 'desc')->get();
+        foreach ($list as $key=>$value){
+            $list[$key]['inning'] = json_decode($value['inning'], true);
+        }
+        $result =array(
+            'status' => 200,
+            'list' => $list
+        );
+        echo json_encode($result);die;
+    }
+
 	function onlyresult(Req $req){
 		$match_id = $req->matchid;
 		$newapp = \App\Models\Stwqresult::where('match_id', $match_id)->first();
@@ -243,6 +258,21 @@ class SportswqController extends Controller {
 
 		\App\Models\Stwqresult::where('match_id', $match_id)->update(["inning"=>json_encode($data)]);
 
+        //添加赛事结果记录
+        $lastLog = \App\Models\Stwqresultlog::where([
+            ['match_id', $match_id],
+            ['type', 1]
+        ])->orderBy('id', 'asc')->first();
+        if(empty($lastLog) || $lastLog['inning'] != json_encode($data)){
+            \App\Models\Stwqresultlog::insert([
+                'match_id' => $match_id,
+                'inning' => json_encode($data),
+                'user_id' => session('adminInfo.admin_id'),
+                'type' => 1,
+                'create_at' => now()
+            ]);
+        }
+
         return responseToJson(1);
 	}
 
@@ -265,6 +295,26 @@ class SportswqController extends Controller {
 		$newapp = new \App\Models\Stwqresult();
 		$newapp->updatestatus('match_id',$match_id,['status'=>2]);//修改结果状态
 
+        //添加赛事结果比较记录
+        $lastLog = \App\Models\Stwqresultlog::where([
+            ['match_id', $match_id],
+            ['type', 2]
+        ])->orderBy('id', 'desc')->first();
+
+        if(empty($lastLog) || !(
+                $lastLog['home_player_score'] == $model->home_player_score
+                && $lastLog['guest_player_score'] == $model->guest_player_score
+            )){
+            $logData = [
+                'home_player_score' => $model->home_player_score,
+                'guest_player_score' => $model->guest_player_score
+            ];
+            $logData['type'] = 2;
+            $logData['match_id'] = $match_id;
+            $logData['user_id'] = session('adminInfo.admin_id');
+            $logData['create_at'] = now();
+            \App\Models\Stwqresultlog::insert($logData);
+        }
 		return responseToJson(1); 
 	}
 

app/Models/SportsNoteList.php

@@ -9,7 +9,7 @@
 namespace App\Models;
 
 use Illuminate\Support\Facades\DB;
-use App\Models\MoneyBuyMatch;
+use App\Models\MoneyBuyMatchb;
 use App\Http\Response\Response;
 
 class SportsNoteList extends BaseModel

resources/views/admin/Sportsbq/outcome.blade.php

@@ -130,7 +130,20 @@
     <style>
 
         .log_title{
-            margin-right: 10px;
+
+        }
+
+        .log_head_div{
+            font-size: 17px;
+            margin-bottom: 5px;
+        }
+        .log_content_div td{
+            padding: 5px;
+            border: 1px solid #888888;
+        }
+
+        hr{
+            margin: 14px 0;
         }
     </style>
 	<script>
@@ -330,8 +343,8 @@
                         info = data['list'][i];
                         if(info.type == 1){ //结果
 
-                            html +='<div style="margin-left: 10px;"><div><span class="log_title">修改人</span>：'+info['loginname']+'<span class="log_title">添加时间：'+info['create_at']+'</span><span class="log_title">添加类型</span>：赛事结果</div>'
-                                    +'<div><table><tr>' +
+                            html +='<div style="margin-left: 20px;"><div class="log_head_div"><span class="log_title">修改人</span>：'+info['loginname']+'&nbsp;&nbsp;&nbsp;<span class="log_title">添加时间：</span>'+info['create_at']+'&nbsp;&nbsp;&nbsp;<span class="log_title">添加类型</span>：赛事结果</div>'
+                                    +'<div class="log_content_div"><table><tr>' +
                                 '<td>第一局比分(主/客)</td>' +
                                 '<td>第二局比分(主/客)</td>' +
                                 '<td>第三局比分(主/客)</td>' +
@@ -353,15 +366,15 @@
                                 '<td>'+info['match_score_t'][8]['home']+'&nbsp;/&nbsp;'+info['match_score_t'][8]['guest']+'</td>' +
                                 '<td>'+info['match_score_t'][9]['home']+'&nbsp;/&nbsp;'+info['match_score_t'][9]['guest']+'</td>' +
                                 '<td>'+info['match_score_t']['other']['home']+'&nbsp;/&nbsp;'+info['match_score_t']['other']['guest']+'</td>' +
-                                '</tr></table></div></div><br>';
+                                '</tr></table></div></div><hr>';
                         }else{ //比分
-                            html +='<div style="margin-left: 10px"><div><span class="log_title">修改人</span>：'+info['loginname']+'<span class="log_title">添加时间：'+info['create_at']+'</span><span class="log_title">添加类型</span>：赛事比分</div>'
-                                    +'<div>上半场比分(主/客)：'+info['u_home_score']+'&nbsp;/&nbsp;'+info['u_guest_score']+'</div>';
-                                    +'<div>整场比分(主/客)：'+info['home_score']+'&nbsp;/&nbsp;'+info['guest_score']+'</div></div><br>';
+                            html +='<div style="margin-left: 20px"><div class="log_head_div"><span class="log_title">修改人</span>：'+info['loginname']+'&nbsp;&nbsp;&nbsp;<span class="log_title">添加时间：</span>'+info['create_at']+'&nbsp;&nbsp;&nbsp;<span class="log_title">添加类型</span>：赛事比分</div>'
+                                    +'<div>上半场比分(主/客)：'+info['u_home_score']+'&nbsp;/&nbsp;'+info['u_guest_score']+'</div>'
+                                    +'<div>整场比分(主/客)：'+info['home_score']+'&nbsp;/&nbsp;'+info['guest_score']+'</div></div><hr>';
                         }
                     }
 
-                    html += '<br><div style="margin-left:400px;"><button class="layui-btn layui-btn-sm layui-btn-green set" id="buttonClick" onclick="rlClick()"><h3>确定</h3></button>&nbsp;<button onclick="rlClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
+                    html += '<br><div style="margin:0px auto 10px;width: 112px;"><button class="layui-btn layui-btn-sm layui-btn-green set" id="buttonClick" onclick="rlClick()"><h3>确定</h3></button>&nbsp;<button onclick="rlClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
 
                     resultLogOpen = layer.open({
                         type: 1 //Page层类型

resources/views/admin/Sportswq/outcome.blade.php

@@ -57,6 +57,7 @@
         @{{#if(d.status==4){ }}
         <span><li class="layui-btn layui-btn-sm  layui-btn-danger" onclick="revoke(@{{d.match_id}})">已作废</li></span>
         @{{#} }}
+        <button onclick="resultLog(@{{d.match_id}})" class="layui-btn layui-btn-sm layui-btn-green set">赛事结果比分记录</button>
     </script>
 
     <script type="text/html" id="status">
@@ -118,7 +119,26 @@
             </form>
         </div>
     </div>
-     
+
+    <style>
+
+        .log_title{
+
+        }
+
+        .log_head_div{
+            font-size: 17px;
+            margin-bottom: 5px;
+        }
+        .log_content_div td{
+            padding: 5px;
+            border: 1px solid #888888;
+        }
+
+        hr{
+            margin: 14px 0;
+        }
+    </style>
 	<script>
         $(function () {
             $('body').on('click', 'a[eventtype="event-delete"]', function () {
@@ -148,7 +168,7 @@
                 success: function(data) {
                     conttxt ='<div style="margin-left:80px;margin-top:20px;font-size:18px;line-height:150%;"><input type="hidden" id="matchid" name="matchid" value="'+match_id+'" /><div style="display: flex;"><li>第一局比分(主/客)：</li><input style="width:50px;" type="text" id="homeo" name="homeo" value="'+data.wqresult[1]['home']+'" autocomplete="off">&nbsp;/&nbsp;<input style="width:50px;" type="text" id="guesto" name="guesto" value="'+data.wqresult[1]['guest']+'" autocomplete="off"></div><div style="display: flex;"><li>第二局比分(主/客)：</li><input style="width:50px;" type="text" id="homet" name="homet" value="'+data.wqresult[2]['home']+'" autocomplete="off">&nbsp;/&nbsp;<input style="width:50px;" type="text" id="guestt" name="guestt" value="'+data.wqresult[2]['guest']+'" autocomplete="off"></div><div style="display: flex;"><li>第三局比分(主/客)：</li><input style="width:50px;" type="text" id="homes" name="homes" value="'+data.wqresult[3]['home']+'" autocomplete="off">&nbsp;/&nbsp;<input style="width:50px;" type="text" id="guests" name="guests" value="'+data.wqresult[3]['guest']+'" autocomplete="off"></div><div style="display: flex;"><li>第四局比分(主/客)：</li><input style="width:50px;" type="text" id="homef" name="homef" value="'+data.wqresult[4]['home']+'" autocomplete="off">&nbsp;/&nbsp;<input style="width:50px;" type="text" id="guestf" name="guestf" value="'+data.wqresult[4]['guest']+'" autocomplete="off"></div><div style="display: flex;"><li>第五局比分(主/客)：</li><input style="width:50px;" type="text" id="homee" name="homee" value="'+data.wqresult[5]['home']+'" autocomplete="off">&nbsp;/&nbsp;<input style="width:50px;" type="text" id="gueste" name="gueste" value="'+data.wqresult[5]['guest']+'" autocomplete="off"></div>';
                     
-                    conttxt += '<br><div style="margin-left:230px;"><button class="layui-btn layui-btn-sm layui-btn-green set" onclick="buttonClick()"><h3>确定</h3></button>&nbsp;<button onclick="czClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
+                    conttxt += '<br><div style="margin-left:230px;"><button class="layui-btn layui-btn-sm layui-btn-green set" id="buttonClick" onclick="buttonClick()"><h3>确定</h3></button>&nbsp;<button onclick="czClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
                 
                 layerOpen = layer.open({
                   type: 1 //Page层类型
@@ -168,6 +188,7 @@
         //layer弹窗结束
 
         function buttonClick(){
+            $("#buttonClick").attr('disabled', true);
             var matchid = $("#matchid").val();
             var homeo = $("#homeo").val();
             var guesto = $("#guesto").val();
@@ -280,6 +301,66 @@
             })
         }
 
+        //layer弹窗开始
+        let resultLogOpen = '';
+        function resultLog(match_id){
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportswq/resultLog',
+                data: {match_id:match_id},
+                success: function(data) {
+                    let length = data.list.length;
+                    if(length <= 0){
+                        layer.alert('该赛事还没有赛事结果比分记录');
+                        return false;
+                    }
+
+                    let html = '';
+                    let info = '';
+                    for(let i=0; i<length; i++){
+                        info = data['list'][i];
+                        if(info.type == 1){ //结果
+
+                            html +='<div style="margin-left: 20px;"><div class="log_head_div"><span class="log_title">修改人</span>：'+info['loginname']+'&nbsp;&nbsp;&nbsp;<span class="log_title">添加时间</span>：'+info['create_at']+'&nbsp;&nbsp;&nbsp;<span class="log_title">添加类型</span>：赛事结果</div>'
+                                +'<div class="log_content_div"><table><tr>' +
+                                '<td>第一局比分(主/客)</td>' +
+                                '<td>第二局比分(主/客)</td>' +
+                                '<td>第三局比分(主/客)</td>' +
+                                '<td>第四局比分(主/客)</td>' +
+                                '<td>第五局比分(主/客)</td>' +
+                                '</tr><tr>' +
+                                '<td>'+info['inning'][1]['home']+'&nbsp;/&nbsp;'+info['inning'][1]['guest']+'</td>' +
+                                '<td>'+info['inning'][2]['home']+'&nbsp;/&nbsp;'+info['inning'][2]['guest']+'</td>' +
+                                '<td>'+info['inning'][3]['home']+'&nbsp;/&nbsp;'+info['inning'][3]['guest']+'</td>' +
+                                '<td>'+info['inning'][4]['home']+'&nbsp;/&nbsp;'+info['inning'][4]['guest']+'</td>' +
+                                '<td>'+info['inning'][5]['home']+'&nbsp;/&nbsp;'+info['inning'][5]['guest']+'</td>' +
+                                '</tr></table></div></div><hr>';
+                        }else{ //比分
+                            html +='<div style="margin-left: 20px"><div class="log_head_div"><span class="log_title">修改人</span>：'+info['loginname']+'&nbsp;&nbsp;&nbsp;<span class="log_title">添加时间</span>：'+info['create_at']+'&nbsp;&nbsp;&nbsp;<span class="log_title">添加类型</span>：赛事比分</div>'
+                            +'<div>赛事比分(主/客)：'+info['home_player_score']+'&nbsp;/&nbsp;'+info['guest_player_score']+'</div></div><hr>';
+                        }
+                    }
+
+                    html += '<br><div style="margin:0px auto 10px;width: 112px;"><button class="layui-btn layui-btn-sm layui-btn-green set" id="buttonClick" onclick="rlClick()"><h3>确定</h3></button>&nbsp;<button onclick="rlClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
+
+                    resultLogOpen = layer.open({
+                        type: 1 //Page层类型
+                        ,area: ['660px', '500px']
+                        ,title: '<h2>赛事结果比分记录<h2>'
+                        ,shade: 0.6 //遮罩透明度
+                        ,maxmin: true //允许全屏最小化
+                        ,anim: 1 //0-6的动画形式，-1不开启
+                        ,content:html
+                    });
+                }
+            })
+        }
+
+        function rlClick() {
+            layer.close(resultLogOpen)
+        }
+
 	</script>
 @push('dataTableJS')
 /*var active = {

resources/views/sports/base_match.blade.php

@@ -204,7 +204,8 @@
     //重置表单
     $('.reset').on('click',function(){
     $('input').val('');
-    $('#form_status').val('');
+    $('#form_status').val('-1');
+
     //	  var type = $(this).data('type');
     //	  active[type] ? active[type].call(this) : '';
     });

resources/views/sports/basket_match.blade.php

@@ -211,6 +211,8 @@
     $('.reset').on('click',function(){
     $('input').val('');
     $('#infoname').val('');
+    $('#form_status').val('-1');
+
     //	  var type = $(this).data('type');
     //	  active[type] ? active[type].call(this) : '';
     });

resources/views/sports/soccer_match.blade.php

@@ -201,6 +201,7 @@
     $('.reset').on('click',function(){
     $('input').val('');
     $('#infoname').val('');
+    $('#form_status').val('-1');
     //	  var type = $(this).data('type');
     //	  active[type] ? active[type].call(this) : '';
     });

resources/views/sports/tennis_match.blade.php

@@ -205,6 +205,8 @@
     $('.reset').on('click',function(){
     $('input').val('');
     $('#infoname').val('');
+    $('#form_status').val('-1');
+
     //	  var type = $(this).data('type');
     //	  active[type] ? active[type].call(this) : '';
     });