异常处理

app/Http/Controllers/Admin/MenuController.php

@@ -205,7 +205,7 @@ class MenuController extends Controller {
 		$dt->setLang('menu');
 		$dt->addColsFields('id', array('sort' => false, 'width' => 100));
 		$dt->addColsFields('name', array('sort' => false, 'width' => 250, 'templet' => '#menudetail'));
-		//    $dt->addColsFields('icon');
+		//    $dt->addColsFields('icon');1
 		$dt->addColsFields('href', array('sort' => false));
 		$dt->addColsFields('type', array('sort' => false, 'width' => 150));
 		$dt->addColsFields('sort', array('width' => 85));

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -212,14 +212,16 @@ class SoccerNoteListController extends Controller
         $pid = $model['match_id'];
 
         if ($qlgame==1) {
-            $saisjg = \App\Models\Stzqresult::where('match_id',$pid)->first()->toArray();//赛事结果
-            $saisjg['corner_ball'] = json_decode($saisjg['corner_ball'],true);
-            $saisjg['first_score'] = json_decode($saisjg['first_score'],true);
-            $saisjg['penalty_card'] = json_decode($saisjg['penalty_card'],true);
-            $saisjg['warn_more'] = json_decode($saisjg['warn_more'],true);
-            
-            $model->single_result = json_encode([$saisjg],JSON_UNESCAPED_UNICODE);
-            $model->save();
+            if($model['result_flag']!=1){
+                $saisjg = \App\Models\Stzqresult::where('match_id',$pid)->first()->toArray();//赛事结果
+                $saisjg['corner_ball'] = json_decode($saisjg['corner_ball'],true);
+                $saisjg['first_score'] = json_decode($saisjg['first_score'],true);
+                $saisjg['penalty_card'] = json_decode($saisjg['penalty_card'],true);
+                $saisjg['warn_more'] = json_decode($saisjg['warn_more'],true);
+                
+                $model->single_result = json_encode([$saisjg],JSON_UNESCAPED_UNICODE);
+                $model->save();
+            }
             $newm = \App\Models\SportsNoteList::where('id', $did)->first();
             return $newm['single_result'];
         }else{

app/Http/Controllers/Admin/SportsfootController.php

@@ -469,25 +469,15 @@ class SportsfootController extends Controller {
 
 	//更新赛事比分
 	function updatenum(Req $req){
-		$type = $req->type;
-		$id = $req->id;
-		$num = $req->num;
 		$match_id = $req->match_id;
 		$newapp = new \App\Models\Stzqresult();
 		
-		if($type==1){
-			$data['u_home_score'] = $num;
-			$res = $newapp->updateInfo($data,$id);//联赛id
-		}else if($type==2){
-			$data['u_guest_score'] = $num;
-			$res = $newapp->updateInfo($data,$id);//联赛id
-		}else if($type==3){
-			$data['home_score'] = $num;
-			$res = $newapp->updateInfo($data,$id);//联赛id
-		}else{
-			$data['guest_score'] = $num;
-			$res = $newapp->updateInfo($data,$id);//联赛id
-		}
+		$data['u_home_score'] = intval($req->u_home_score)?intval($req->u_home_score):0;
+		$data['u_guest_score'] = intval($req->u_guest_score)?intval($req->u_guest_score):0;
+		$data['home_score'] = intval($req->home_score)?intval($req->home_score):0;
+		$data['guest_score'] = intval($req->guest_score)?intval($req->guest_score):0;
+		$newapp->updateInfo($data,$match_id);//联赛id
+	
 		$newapp->totalgoal($match_id);
 		$update = $this->addcomendnotice($match_id);
 

app/Models/Stzqresult.php

@@ -30,9 +30,9 @@ class Stzqresult extends BaseModel
     }
 
     //更新
-    function updateInfo($data, $id)
+    function updateInfo($data, $match_id)
     {
-        $res = $this->where ('id', $id)->update ($data);
+        $res = $this->where ('match_id', $match_id)->update ($data);
         if (!$res) {
             return -7010101202; //更新失败
         }

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

@@ -138,6 +138,9 @@
             @{{#if(d.status==4){ }}
             <span><li class="layui-btn layui-btn-sm  layui-btn-danger" onclick="revokeft(@{{d.match_id}})">已作废</li></span>
             @{{#} }}
+            @{{#if(d.status==5){ }}
+            <span><li class="layui-btn layui-btn-sm  layui-btn-danger">结算中</li></span>
+            @{{#} }}
     </script>
 
     <script type="text/html" id="statusmatch">
@@ -159,10 +162,11 @@
     </script>
 
     <script type="text/html" id="sxalfcourt">
-            <input type="text" style="width:30px;heigth:20px" id="u_home_score@{{d.id}}" name="u_home_score" value="@{{d.u_home_score}}" onchange="inputFunc(@{{d.id}}, event.target.value,@{{d.match_id}})"> 
-            <input type="text" style="width:30px;heigth:20px" id="u_guest_score@{{d.id}}" name="u_guest_score" value="@{{d.u_guest_score}}" onchange="inputTunc(@{{d.id}}, event.target.value,@{{d.match_id}})"> / 
-            <input type="text" style="width:30px;heigth:20px" id="home_score@{{d.id}}" name="home_score" value="@{{d.home_score}}" onchange="inputSunc(@{{d.id}}, event.target.value,@{{d.match_id}})">
-            <input type="text" style="width:30px;heigth:20px" id="guest_score@{{d.id}}" name="guest_score" value="@{{d.guest_score}}" onchange="inputAunc(@{{d.id}}, event.target.value,@{{d.match_id}})">
+            <input type="text" style="width:30px;heigth:20px" id="u_home_score@{{d.match_id}}" name="u_home_score" value="@{{d.u_home_score}}" > 
+            <input type="text" style="width:30px;heigth:20px" id="u_guest_score@{{d.match_id}}" name="u_guest_score" value="@{{d.u_guest_score}}"> / 
+            <input type="text" style="width:30px;heigth:20px" id="home_score@{{d.match_id}}" name="home_score" value="@{{d.home_score}}">
+            <input type="text" style="width:30px;heigth:20px" id="guest_score@{{d.match_id}}" name="guest_score" value="@{{d.guest_score}}">
+            <button class="layui-btn layui-btn-sm lay-btn-diy" onclick="inputscore(@{{d.match_id}})"><h6>提交</h6></button>
     </script>
 
 
@@ -200,19 +204,6 @@
                         </div>
                    </div>
 
-                    <!-- <div class="layui-inline">
-                        <label class="layui-form-label">相关操作:</label>
-                        <div class="layui-input-inline" style="width: 200px">
-                            <select name=""  id=""  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="">选择确认</option>
-                                @foreach(trans('status.xgstatus.status') as $k=>$v):
-                                    <option value="{{$k}}">{{$v}}</option>
-                                @endforeach
-                                <option value="">设为无效</option>
-                            </select>
-                        </div>
-                    </div> -->
-
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsfoot.star_time') }}</label>
                         <div class="layui-input-inline">
@@ -226,8 +217,6 @@
                         </div>
                     </div>
 
-
-
                     <div class="layui-inline">
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
@@ -256,27 +245,6 @@
                 <div class="modal-body">
                     <p style="text-align:left;color:#5f7788;">请认真填写赛事结果,将会按照改结果结算</p><br>
                     <div style="text-align:left;">
-                        <div style="display: flex;">
-                            <li>最先进球球队：</li>
-                            <select name="firstscore" id="firstscore">
-                            </select>
-                        </div>
-                        <div style="display: flex;">
-                            <li> 进 &nbsp; 球&nbsp; 方&nbsp;式&nbsp;：</li>
-                            <select name="firststye" id="firststye">
-                            </select>
-                        </div>
-                        <div style="display: flex;">
-                            <li>最后进球球队：</li>
-                            <select name="lastscore" id="lastscore">
-                            </select>
-                        </div>
-                        <div style="display: flex;">
-                            <li>最先进球时间：</li><input type="text" id="onescoretime" name="onescoretime" value="" autocomplete="off">分钟
-                        </div>
-                        <div style="display: flex;">
-                            <li> 获 &nbsp; 胜&nbsp; 球&nbsp;队&nbsp;：</li><input type="text" id="matchwiner" name="matchwiner" value="">
-                        </div>
                         <div style="display: flex;">
                             <li>主队全场角球：</li><input type="text" id="homeallcorner" name="homeallcorner" value="" autocomplete="off">
                         </div>
@@ -300,6 +268,27 @@
                         </div> 
                         <div style="display: flex;">
                             <li>客队半场罚牌：</li><input type="text" id="guesthalfcard" name="guesthalfcard" value="" autocomplete="off">
+                        </div>
+                        <div style="display: flex;">
+                            <li>最先进球球队：</li>
+                            <select name="firstscore" id="firstscore">
+                            </select>
+                        </div>
+                        <div style="display: flex;">
+                            <li>最后进球球队：</li>
+                            <select name="lastscore" id="lastscore">
+                            </select>
+                        </div>
+                        <div style="display: flex;">
+                            <li> 进 &nbsp; 球&nbsp; 方&nbsp;式&nbsp;：</li>
+                            <select name="firststye" id="firststye">
+                            </select>
+                        </div>
+                        <div style="display: flex;">
+                            <li>最先进球时间：</li><input type="text" id="onescoretime" name="onescoretime" value="" autocomplete="off">分钟
+                        </div>
+                        <div style="display: flex;">
+                            <li> 获 &nbsp; 胜&nbsp; 球&nbsp;队&nbsp;：</li><input type="text" id="matchwiner" name="matchwiner" value="">
                         </div><br>
                     </div>
                 </div>
@@ -347,35 +336,44 @@
                     document.getElementById("guesthalfcorner").value=data.corner_ball.guest_half;
                     document.getElementById("onescoretime").value=data.first_score.scoretime;//首进球时间
 
-                    firstscore = "<option value='"+ data.first_score.teamscore +"' selected=''> ";
-                    if (data.first_score.teamscore.length>0){
-                        firstscore += data.first_score.teamscore;
-                        firstscore += "</option><option value=''>请选择最先进球";
-                    }else{
-                        firstscore += '请选择最先进球';
-                    }
-                    firstscore += " </option><option value=" +data.newapp.home_team + ">" + data.newapp.home_team + "</option><option value=" +data.newapp.guest_team + ">" + data.newapp.guest_team + "</option>";
-                    $("#firstscore").html(firstscore);
-
-                    firststye = "<option value='"+ data.first_score.scoretype +"' selected=''> ";
-                    if (data.first_score.scoretype.length>0){
-                        firststye += data.first_score.scoretype ;
-                        firststye += "</option><option value=''>请选择最先进球方式";
-                    }else{
-                        firststye += '请选择最先进球方式';
-                    }
-                    firststye += " </option><option value='射门'>射门</option><option value='头球'>头球</option><option value='无进球'>无进球</option><option value='点球'>点球</option><option value='任意球'>任意球</option><option value='乌龙球'>乌龙球</option>";
-                    $("#firststye").html(firststye);
-
-                    lastscore = "<option value='"+data.newapp.last_score+"' selected=''>";
-                    if (data.newapp.last_score){
-                        lastscore += data.newapp.last_score;
-                        lastscore += "</option><option value=''>请选择最后进球";
+                    if(data.newapp.home_score>0 || data.newapp.guest_score>0){
+                        firstscore = "<option value='"+ data.first_score.teamscore +"' selected=''> ";
+                        if (data.first_score.teamscore.length>0){
+                            firstscore += data.first_score.teamscore;
+                            firstscore += "</option><option value=''>无进球";
+                        }else{
+                            firstscore += '请选择最先进球';
+                        }
+                        firstscore += " </option><option value=" +data.newapp.home_team + ">" + data.newapp.home_team + "</option><option value=" +data.newapp.guest_team + ">" + data.newapp.guest_team + "</option>";
+                        $("#firstscore").html(firstscore);
+
+                        firststye = "<option value='"+ data.first_score.scoretype +"' selected=''> ";
+                        if (data.first_score.scoretype.length>0){
+                            firststye += data.first_score.scoretype ;
+                            firststye += "</option><option value=''>无方式";
+                        }else{
+                            firststye += '请选择最先进球方式';
+                        }
+                        firststye += " </option><option value='射门'>射门</option><option value='头球'>头球</option><option value='无进球'>无进球</option><option value='点球'>点球</option><option value='任意球'>任意球</option><option value='乌龙球'>乌龙球</option>";
+                        $("#firststye").html(firststye);
+
+                        lastscore = "<option value='"+data.newapp.last_score+"' selected=''>";
+                        if (data.newapp.last_score){
+                            lastscore += data.newapp.last_score;
+                            lastscore += "</option><option value=''>无进球";
+                        }else{
+                            lastscore += '请选择最后进球';
+                        }
+                        lastscore += "</option><option value=" + data.newapp.home_team + ">" + data.newapp.home_team + "</option><option value=" + data.newapp.guest_team + ">" + data.newapp.guest_team + "</option>";
+                        $("#lastscore").html(lastscore);
                     }else{
-                        lastscore += '请选择最后进球';
+                        firstscore = "";
+                        $("#firstscore").html(firstscore);
+                        firststye = "";
+                        $("#firststye").html(firststye);
+                        lastscore = "";
+                        $("#lastscore").html(lastscore);
                     }
-                    lastscore += "</option><option value=" + data.newapp.home_team + ">" + data.newapp.home_team + "</option><option value=" + data.newapp.guest_team + ">" + data.newapp.guest_team + "</option>";
-                    $("#lastscore").html(lastscore);
                 }
             }) 
 
@@ -498,99 +496,24 @@
             })
         }
 
-        //上半场主队
-        function inputFunc(id,num,match_id){
-            var id = id;
-            var num = num;
-            var reg = /^[0-99]\d*$/;
-            var home_score = $("#home_score"+id).val();
-            if(reg.test(num)==false){ 
-                layer.msg('不能为空值');
-                reloadDataTable();return;
-            } 
-            if(num>home_score){
-                layer.msg('请输入正确的全场比分');
-                reloadDataTable();return;
-            }
-
-            $.ajax({
-                type: 'POST',
-                dataType: 'json',
-                url: '/admin/Sportsfoot/updatenum',
-                data: {id:id,num:num,type:1,match_id:match_id},
-                success: function(data) {
-                    if(data.status==1){
-                        layer.msg(data.msg);
-                        location. reload()//刷新当前页面
-                    }
-                }
-            })
-        }
-
-        //上半场客队
-        function inputTunc(id,num,match_id){
-           var id = id;
-            var num = num;
-            var reg = /^[0-99]\d*$/;
-            var guest_score = $("#guest_score"+id).val();
-            if(reg.test(num)==false){ 
-                layer.msg('不能为空值');
-                reloadDataTable();return;
-            }else if(num>guest_score){
-                layer.msg('请输入正确的全场比分');
-                reloadDataTable();return;
-            }
-            $.ajax({
-                type: 'POST',
-                dataType: 'json',
-                url: '/admin/Sportsfoot/updatenum',
-                data: {id:id,num:num,type:2,match_id:match_id},
-                success: function(data) {
-                    if(data.status==1){
-                        layer.msg(data.msg);
-                        location. reload()//刷新当前页面
-                    }
-                }
-            })
-        }
+        //修改全场半场比分
+        function inputscore(match_id){
+            var match_id = match_id;
+            var u_home_score = document.getElementById("u_home_score"+match_id).value;
+            var u_guest_score = document.getElementById("u_guest_score"+match_id).value;
+            var home_score = document.getElementById("home_score"+match_id).value;
+            var guest_score = document.getElementById("guest_score"+match_id).value;
 
-        //全场主队
-        function inputSunc(id,num,match_id){
-            var id = id;
-            var num = num;
-            var u_home_score = $("#u_home_score"+id).val();
-            if(u_home_score>num){ 
+            if(home_score<u_home_score || guest_score<u_guest_score){
                 layer.msg('请输入正确的全场比分');
                 reloadDataTable();return;
             }
-            $.ajax({
-                type: 'POST',
-                dataType: 'json',
-                url: '/admin/Sportsfoot/updatenum',
-                data: {id:id,num:num,type:3,match_id:match_id},
-                success: function(data) {
-                    if(data.status==1){
-                        layer.msg(data.msg);
-                        location. reload()//刷新当前页面
-                    }
-                }
-            })
-        }
 
-        //全场客队
-        function inputAunc(id,num,match_id){
-            var id = id;
-            var num = num;
-            var u_guest_score = $("#u_guest_score"+id).val();
-            if(u_guest_score>num){ 
-                layer.msg('请输入正确的全场比分');
-                reloadDataTable();return;
-            }
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
                 url: '/admin/Sportsfoot/updatenum',
-                data: {id:id,num:num,type:4,match_id:match_id},
+                data: {match_id:match_id,u_home_score:u_home_score,u_guest_score:u_guest_score,home_score:home_score,guest_score:guest_score},
                 success: function(data) {
                     if(data.status==1){
                         layer.msg(data.msg);

resources/views/sports/sports_notelist.blade.php

@@ -310,27 +310,6 @@
                 <div class="modal-body">
                     <p style="text-align:left;color:#5f7788;">请认真填写赛事结果,将会按照改结果结算</p><br>
                     <div style="text-align:left;">
-                        <div style="display: flex;">
-                            <li>最后进球球队：</li>
-                            <select name="lastscore" id="lastscore">
-                            </select>
-                        </div>
-                        <div style="display: flex;">
-                            <li>最先进球球队：</li>
-                            <select name="firstscore" id="firstscore">
-                            </select>
-                        </div>
-                        <div style="display: flex;">
-                            <li> 进 &nbsp; 球&nbsp; 方&nbsp;式&nbsp;：</li>
-                            <select name="firststye" id="firststye">
-                            </select>
-                        </div>
-                        <div style="display: flex;">
-                            <li>最先进球时间：</li><input type="text" id="onescoretime" name="onescoretime" value="" autocomplete="off">分钟
-                        </div>
-                        <div style="display: flex;">
-                            <li> 获 &nbsp;胜&nbsp; 球&nbsp; 队&nbsp;：</li><input type="text" id="matchwiner" name="matchwiner" value="">
-                        </div>
                         <div style="display: flex;">
                             <li>主队全场进球：</li><input type="text" id="home_score" name="home_score" value="" autocomplete="off">
                         </div>
@@ -366,6 +345,26 @@
                         </div> 
                         <div style="display: flex;">
                             <li>客队半场罚牌：</li><input type="text" id="guesthalfcard" name="guesthalfcard" value="" autocomplete="off">
+                        </div><div style="display: flex;">
+                            <li>最后进球球队：</li>
+                            <select name="lastscore" id="lastscore">
+                            </select>
+                        </div>
+                        <div style="display: flex;">
+                            <li>最先进球球队：</li>
+                            <select name="firstscore" id="firstscore">
+                            </select>
+                        </div>
+                        <div style="display: flex;">
+                            <li> 进 &nbsp; 球&nbsp; 方&nbsp;式&nbsp;：</li>
+                            <select name="firststye" id="firststye">
+                            </select>
+                        </div>
+                        <div style="display: flex;">
+                            <li>最先进球时间：</li><input type="text" id="onescoretime" name="onescoretime" value="" autocomplete="off">分钟
+                        </div>
+                        <div style="display: flex;">
+                            <li> 获 &nbsp;胜&nbsp; 球&nbsp; 队&nbsp;：</li><input type="text" id="matchwiner" name="matchwiner" value="">
                         </div><br>
                     </div>
                 </div>
@@ -420,35 +419,44 @@
                     document.getElementById("guesthalfcorner").value=data[0].corner_ball.guest_half;
                     document.getElementById("onescoretime").value=data[0].first_score.scoretime;//首进球时间
 
-                    firstscore = "<option value='"+ data[0].first_score.teamscore +"' selected=''> ";
-                    if (data[0].first_score.teamscore.length>0){
-                        firstscore += data[0].first_score.teamscore;
-                        firstscore += "</option><option value=''>请选择最先进球";
-                    }else{
-                        firstscore += '请选择最先进球';
-                    }
-                    firstscore += " </option><option value=" +data[0].home_team + ">" + data[0].home_team + "</option><option value=" +data[0].guest_team + ">" + data[0].guest_team + "</option>";
-                    $("#firstscore").html(firstscore);
-
-                    firststye = "<option value='"+ data[0].first_score.scoretype +"' selected=''> ";
-                    if (data[0].first_score.scoretype.length>0){
-                        firststye += data[0].first_score.scoretype;
-                        firststye += "</option><option value=''>请选择最先进球方式";
-                    }else{
-                        firststye += '请选择最先进球方式';
-                    }
-                    firststye += " </option><option value='射门'>射门</option><option value='头球'>头球</option><option value='无进球'>无进球</option><option value='点球'>点球</option><option value='任意球'>任意球</option><option value='乌龙球'>乌龙球</option>";
-                    $("#firststye").html(firststye);
-
-                    lastscore = "<option value='"+data[0].last_score+"' selected=''>";
-                    if (data[0].last_score.length>0){
-                        lastscore += data[0].last_score;
-                        lastscore += "</option><option value=''>请选择最后进球";
+                    if(data[0].home_score>0 || data[0].guest_score>0){
+                        firstscore = "<option value='"+ data[0].first_score.teamscore +"' selected=''> ";
+                        if (data[0].first_score.teamscore.length>0){
+                            firstscore += data[0].first_score.teamscore;
+                            firstscore += "</option><option value=''>无进球";
+                        }else{
+                            firstscore += '请选择最先进球';
+                        }
+                        firstscore += " </option><option value=" +data[0].home_team + ">" + data[0].home_team + "</option><option value=" +data[0].guest_team + ">" + data[0].guest_team + "</option>";
+                        $("#firstscore").html(firstscore);
+
+                        firststye = "<option value='"+ data[0].first_score.scoretype +"' selected=''> ";
+                        if (data[0].first_score.scoretype.length>0){
+                            firststye += data[0].first_score.scoretype;
+                            firststye += "</option><option value=''>无进球方式";
+                        }else{
+                            firststye += '请选择最先进球方式';
+                        }
+                        firststye += " </option><option value='射门'>射门</option><option value='头球'>头球</option><option value='无进球'>无进球</option><option value='点球'>点球</option><option value='任意球'>任意球</option><option value='乌龙球'>乌龙球</option>";
+                        $("#firststye").html(firststye);
+
+                        lastscore = "<option value='"+data[0].last_score+"' selected=''>";
+                        if (data[0].last_score.length>0){
+                            lastscore += data[0].last_score;
+                            lastscore += "</option><option value=''>无进球";
+                        }else{
+                            lastscore += '请选择最后进球';
+                        }
+                        lastscore += "</option><option value=" + data[0].home_team + ">" + data[0].home_team + "</option><option value=" + data[0].guest_team + ">" + data[0].guest_team + "</option>";
+                        $("#lastscore").html(lastscore);
                     }else{
-                        lastscore += '请选择最后进球';
+                        firstscore = "";
+                        $("#firstscore").html(firstscore);
+                        firststye = "";
+                        $("#firststye").html(firststye);
+                        lastscore = "";
+                        $("#lastscore").html(lastscore);
                     }
-                    lastscore += "</option><option value=" + data[0].home_team + ">" + data[0].home_team + "</option><option value=" + data[0].guest_team + ">" + data[0].guest_team + "</option>";
-                    $("#lastscore").html(lastscore);
                 }
             })