彭俊 6 anni fa
parent
commit
b88948a222

+ 24 - 117
app/Http/Model/StWqResult.php

@@ -166,57 +166,34 @@ class StWqResult extends Model
                         $match_winer = $v['guest_team'];
                     }
 
-                    dd($result_mark['best']);
                     //组装输赢结果json
-                    if($result_mark['best'] == 3)
                     $inning = [
                         1=>[
-                            "home"=>[
-                                1=>1,
-                                2=>0,
-                                3=>1,
-                                4=>1,
-                            ],
-                            "guest"=>[
-                                1=>1,
-                                2=>0,
-                                3=>1,
-                                4=>1,
-                            ],
+                            "home"=>$result_mark['sc_1th_H'],
+                            "guest"=>$result_mark['sc_1th_C'],
                         ],
                         2=>[
-                            "home"=>[
-                                1=>1,
-                                2=>0,
-                                3=>1,
-                                4=>1,
-                            ],
-                            "guest"=>[
-                                1=>1,
-                                2=>0,
-                                3=>1,
-                                4=>1,
-                            ],
+                            "home"=>$result_mark['sc_2th_H'],
+                            "guest"=>$result_mark['sc_2th_C'],
                         ],
                         3=>[
-                            "home"=>[
-                                1=>1,
-                                2=>0,
-                                3=>1,
-                                4=>1,
-                            ],
-                            "guest"=>[
-                                1=>1,
-                                2=>0,
-                                3=>1,
-                                4=>1,
-                            ],
+                            "home"=>$result_mark['sc_3th_H'],
+                            "guest"=>$result_mark['sc_3th_C'],
                         ],
-
+                        4=>[
+                            "home"=>$result_mark['sc_4th_H'],
+                            "guest"=>$result_mark['sc_1th_C'],
+                        ],
+                        5=>[
+                            "home"=>$result_mark['sc_5th_H'],
+                            "guest"=>$result_mark['sc_5th_C'],
+                        ],
+                    
                     ];
-                  
-                    dd(json_encode($inning));
 
+                    //赛事比分
+                    $match_score = $result_mark['game_num_H'].':'.$result_mark['game_num_C'];
+                   
                     //赛事待写入赛果数据
                     $set_match_r[] = [
                         "match_id"=> $v['id'],
@@ -234,24 +211,23 @@ class StWqResult extends Model
                         "guest_player_let_plate"=> $resultData['guest_player_let_plate']?:0, //客队让盘
                         "home_player_let_inning"=> $resultData['home_player_let_inning']?:0, //主队让局
                         "guest_player_let_inning"=> $resultData['guest_player_let_inning']?:0, //客队让局
-                        "home_player_score"=> json_encode($home_score)?:'', //主队得分
-                        "guest_player_score"=> json_encode($guest_score)?:'', //客队得分
+                        "home_player_score"=> $result_mark['game_num_H']?:'', //主队得分
+                        "guest_player_score"=> $result_mark['game_num_C']?:'', //客队得分
                         "all_inning"=> $resultData['all_inning']?:0, //总局数
-                        "first_score_player"=> $resultData['first_score']?:'', //最先得分
-                        "last_score_player"=> $resultData['last_score']?:'', //最后得分
+                        // "first_score_player"=> $resultData['first_score']?:'', //最先得分
+                        // "last_score_player"=> $resultData['last_score']?:'', //最后得分
                         "first_inning_score"=> $resultData['first_inning_score']?:0, //第一局比分
                         "second_inning_score"=> $resultData['second_inning_score']?:0,//第二局比分
                         "third_inning_score"=> $resultData['third_inning_score']?:0,//第三局比分
-                        // "match_score"=> ,//赛事比分
+                        "match_score"=> $match_score?:'',//赛事比分
                         "match_winer_player"=>  $match_winer?:'',//获胜队员
                         "match_process"=> $match_process?:'',//比赛进程
-                        // "inning"=> ,//每局输赢结果
+                        "inning"=> json_encode($inning)?:'',//每局输赢结果
                     ];    
                 }
             }
         }
 
-
         //写入赛果
         if(!empty($set_match_r)){
             $ret = $model['model_result']::insert($set_match_r);
@@ -259,75 +235,6 @@ class StWqResult extends Model
         }
 
         return 1;
-
-
-        
-
-        /*
-        //没有数据,无需操作
-        if(empty($matchData)) return Response::success();
-        //获取赛事结果表 所有当月
-        $matchData_r = $model['model_result']::select('match_id')
-            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-7 day"))]])
-            ->get()
-            ->toarray();
-
-        //结果表无数据,直接插入
-        if(empty($matchData_r)){
-            foreach ($matchData as $k=>$v){
-                $start_time = ($v['match_date'].' '.$v['match_time']);
-                $time = time()-strtotime($v['match_time']);
-                $match_time = self::secTime($time);
-                $set_match_r[] = [
-                    "match_id"=> $v['id'],
-                    "home_player_name"=>$v['home_team'],
-                    "guest_player_name"=>$v['guest_team'],
-                    "lg_id"=>$v['lg_id'],
-                    "status"=>$v['status'],
-                    "tag"=> $v['tag'],
-                    'match_time'=>$match_time,
-                    "ctime"=>date('Y-m-d H:i:s'),
-                    "update_time"=>date('Y-m-d H:i:s'),
-                    "start_time"=>date('Y-m-d H:i:s',strtotime($start_time))
-                ];
-            }
-            $ret = $model['model_result']::insert($set_match_r);
-            if($ret != true) throw new \Exception( Response::generate('',Response::ADD_MATCH_R_ERROR));
-        }else {
-
-            //如果结果表有数据,则获取结果表没有的赛事
-            foreach ($matchData as $k => $v) {
-                foreach ($matchData_r as $kk => $vv) {
-                    if ($v['id'] == $vv['match_id']) {
-                        unset($matchData[$k]);
-                    }
-                }
-            }
-            //如果还有未写入赛事
-            if (!empty($matchData)) {
-                //写入结果表不存在赛事
-                foreach ($matchData as $k => $v) {
-                    $start_time = ($v['match_date'] . ' ' . $v['match_time']);
-                    $time = time() - strtotime($v['match_time']);
-                    $match_time = self::secTime($time);
-                    $set_match_r[] = [
-                        "match_id" => $v['id'],
-                        "home_player_name" => $v['home_team'],
-                        "guest_player_name" => $v['guest_team'],
-                        "lg_id" => $v['lg_id'],
-                        "status" => $v['status'],
-                        "tag" => $v['tag'],
-                        'match_time' => $match_time,
-                        "ctime" => date('Y-m-d H:i:s'),
-                        "update_time" => date('Y-m-d H:i:s'),
-                        "start_time" => date('Y-m-d H:i:s', strtotime($start_time))
-                    ];
-                }
-                $ret = $model['model_result']::insert($set_match_r);
-                if ($ret != true) throw new \Exception(Response::generate('', Response::ADD_MATCH_R_ERROR));//Render([], '10022', lang('Tips','Sports')->get('add_match_r_error'));
-            }
-        }
-        */
     }
 
     //计算滚球 赛事进行时间

+ 9 - 3
resources/views/admin/sportsfoot/addwarn.blade.php

@@ -64,6 +64,8 @@
             })
         })
 
+        let conttxt = '';
+        let layerOpen = '';
         function addResult(match_id,wid,typenum){
             var wid = wid?wid:0;
             $.ajax({
@@ -72,7 +74,7 @@
                 url: '/admin/Sportsfoot/warnresult',
                 data: {match_id:match_id,wid:wid},
                 success: function(data) {
-                    var  conttxt ='<div style="margin-left:50px;margin-top:20px;font-size:18px;line-height:150%;"><input type="hidden" id="matchid" name="matchid" value="'+match_id+'" /><input type="hidden" id="wid" name="wid" value="'+wid+'" /><input type="hidden" id="typenum" name="typenum" value="'+typenum+'" /><div style="display: flex;"><li>危险球时间:</li>';
+                    conttxt ='<div style="margin-left:50px;margin-top:20px;font-size:18px;line-height:150%;"><input type="hidden" id="matchid" name="matchid" value="'+match_id+'" /><input type="hidden" id="wid" name="wid" value="'+wid+'" /><input type="hidden" id="typenum" name="typenum" value="'+typenum+'" /><div style="display: flex;"><li>危险球时间:</li>';
 
                     if(wid!=0){
                         conttxt += '<input type="text" id="timei" name="timei" value="'+data.warn_more[wid].timei+'" autocomplete="off">';
@@ -87,9 +89,9 @@
                         conttxt += '<option value="0">请选择危险球类型';
                     }
 
-                    conttxt += '</option><option value="角球">角球</option><option value="12码罚球">12码罚球</option><option value="自由球">自由球</option><option value="掷入球">掷入球</option></select></div><br><div style="margin-left:230px;"><button class="layui-btn layui-btn-sm layui-btn-green set" onclick="buttonClick()"><h3>确定</h3></button>&nbsp;<button class="layui-btn layui-btn-sm layui-btn-danger"><h3>取消</h3></button></div></div>';
+                    conttxt += '</option><option value="角球">角球</option><option value="12码罚球">12码罚球</option><option value="自由球">自由球</option><option value="掷入球">掷入球</option></select></div><br><div style="margin-left:230px;"><button class="layui-btn layui-btn-sm layui-btn-green set" onclick="buttonClick()"><h3>确定</h3></button>&nbsp;<button class="layui-btn layui-btn-sm layui-btn-danger" onclick="czClick()"><h3>取消</h3></button></div></div>';
 
-                    layer.open({
+                    layerOpen = layer.open({
                       type: 1 //Page层类型
                       ,area: ['500px', '200px']
                       ,title: '<h2>危险球结果添加<h2>'
@@ -102,6 +104,10 @@
             })
         }
 
+        function czClick() {
+            layer.close(layerOpen)
+        }
+
         function buttonClick(){
             var matchid = $("#matchid").val();
             var timei = $("#timei").val();

+ 8 - 3
resources/views/admin/sportsfoot/outcome.blade.php

@@ -157,6 +157,8 @@
         })
 
         //layer弹窗开始
+        let conttxt = '';
+        let layerOpen = '';
         function addResult(match_id){
             $.ajax({
                 type: 'POST',
@@ -164,7 +166,7 @@
                 url: '/admin/Sportsfoot/Matchresult',
                 data: {match_id:match_id},
                 success: function(data) {
-                    var  conttxt ='<div style="margin-left:100px;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 type="text" id="homeallcorner" name="homeallcorner" value="'+data.corner_ball.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场角球:</li><input type="text" id="guestallcorner" name="guestallcorner" value="'+data.corner_ball.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场角球:</li><input type="text" id="homehalfcorner" name="homehalfcorner" value="'+data.corner_ball.home_half+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场角球:</li><input type="text" id="guesthalfcorner" name="guesthalfcorner" value="'+data.corner_ball.guest_half+'" autocomplete="off"></div><div style="display: flex;"><li>主队全场罚牌:</li><input type="text" id="homeallcard" name="homeallcard" value="'+data.penalty_card.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场罚牌:</li><input type="text" id="guestallcard" name="guestallcard" value="'+data.penalty_card.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场罚牌:</li><input type="text" id="homehalfcard" name="homehalfcard" value="'+data.penalty_card.home_half+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场罚牌:</li><input type="text" id="guesthalfcard" name="guesthalfcard" value="'+data.penalty_card.guest_half+'" autocomplete="off"></div>';
+                    conttxt ='<div style="margin-left:100px;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 type="text" id="homeallcorner" name="homeallcorner" value="'+data.corner_ball.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场角球:</li><input type="text" id="guestallcorner" name="guestallcorner" value="'+data.corner_ball.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场角球:</li><input type="text" id="homehalfcorner" name="homehalfcorner" value="'+data.corner_ball.home_half+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场角球:</li><input type="text" id="guesthalfcorner" name="guesthalfcorner" value="'+data.corner_ball.guest_half+'" autocomplete="off"></div><div style="display: flex;"><li>主队全场罚牌:</li><input type="text" id="homeallcard" name="homeallcard" value="'+data.penalty_card.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场罚牌:</li><input type="text" id="guestallcard" name="guestallcard" value="'+data.penalty_card.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场罚牌:</li><input type="text" id="homehalfcard" name="homehalfcard" value="'+data.penalty_card.home_half+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场罚牌:</li><input type="text" id="guesthalfcard" name="guesthalfcard" value="'+data.penalty_card.guest_half+'" autocomplete="off"></div>';
                     if (data.newapp.home_score!=0 || data.newapp.guest_score!=0){
                         conttxt += '<div style="display: flex;"><li>首 进 球 时 间:</li><input type="text" id="onescoretime" name="onescoretime" value="'+data.first_score.scoretime+'" autocomplete="off"></div><div style="display: flex;"><li>最终获胜球队:</li><input type="text" id="matchwiner" name="matchwiner" value="'+data.newapp.match_winer+'" autocomplete="off"></div><div style="display: flex;"><li>最先进球球队:</li><select name="firstscore" id="firstscore">';
                         if(data.first_score.teamscore!=0){
@@ -191,9 +193,9 @@
                         conttxt += '<option value="'+ data.newapp.home_team +'">'+data.newapp.home_team+'</option><option value="'+ data.newapp.guest_team +'">'+data.newapp.guest_team+'</option></select></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 class="layui-btn layui-btn-sm layui-btn-danger"><h3>取消</h3></button></div></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>';
                 
-                layer.open({
+                layerOpen = layer.open({
                   type: 1 //Page层类型
                   ,area: ['600px', '500px']
                   ,title: '<h2>赛事结果添加<h2>'
@@ -205,6 +207,9 @@
                 }
             }) 
         }
+        function czClick() {
+            layer.close(layerOpen)
+        }
         //layer弹窗结束
         
         function buttonClick(){

+ 8 - 2
resources/views/sports/sports_notelist.blade.php

@@ -155,6 +155,8 @@
             })
         })
 
+        let conttxt = '';
+        let layerOpen = '';
         function addResult($id,$qlgame){
             var did = $id;
             var qlgame = 1;
@@ -192,9 +194,9 @@
                         conttxt += '<option value="'+data[0].home_team+'">'+data[0].home_team+'</option><option value="'+data[0].guest_team+'">'+data[0].guest_team+'</option></select></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 class="layui-btn layui-btn-sm layui-btn-danger"><h3>取消</h3></button></div></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"><h3>取消</h3></button></div></div>';
 
-                    layer.open({
+                    layerOpen = layer.open({
                         type: 1 //Page层类型
                         ,area: ['600px', '600px']
                         ,title: '<h2>订单赛事结果添加<h2>'
@@ -207,6 +209,10 @@
             }) 
         }
 
+        function czClick() {
+            layer.close(layerOpen)
+        }
+
         function buttonClick(){
             var did = $("#did").val();
             var qlgame = 2;