异常处理

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -1627,18 +1627,68 @@ class SoccerNoteListController extends Controller
         }
 
         if ($game_code == 'wq') {
-            $home = $pdatas['home'];
-            $guest = $pdatas['guest'];
-
-            $arrs = [];
-            for ($i = 0; $i <= 4; $i++) {
-                $j = $i + 1;
-                $arrs[$j] = [
-                    'home' => intval($home[$i]),
-                    'guest' => intval($guest[$i]),
+//{"1":{"home":0,"guest":0},"2":{"home":0,"guest":0},"3":{"home":0,"guest":0},"4":{"home":0,"guest":0},"5":{"home":0,"guest":0},"all":{"home":0,"guest":0}}
+            if($ScoreTitle == '全场'){
+                $arrs = [
+                    '1'=>['home'=>$home_sorce,'guest'=>$guest_sorce],
+                    '2'=>['home'=>0,'guest'=>0],
+                    '3'=>['home'=>0,'guest'=>0],
+                    '4'=>['home'=>0,'guest'=>0],
+                    '5'=>['home'=>0,'guest'=>0],
+                    'all'=>['home'=>0,'guest'=>0],
                 ];
             }
-
+            if($ScoreTitle == '第一盘'){
+                $arrs = [
+                    '1'=>['home'=>$home_sorce,'guest'=>$guest_sorce],
+                    '2'=>['home'=>0,'guest'=>0],
+                    '3'=>['home'=>0,'guest'=>0],
+                    '4'=>['home'=>0,'guest'=>0],
+                    '5'=>['home'=>0,'guest'=>0],
+                    'all'=>['home'=>0,'guest'=>0],
+                ];
+            }   
+            if($ScoreTitle == '第二盘'){
+                $arrs = [
+                    '1'=>['home'=>0,'guest'=>0],
+                    '2'=>['home'=>$home_sorce,'guest'=>$guest_sorce],
+                    '3'=>['home'=>0,'guest'=>0],
+                    '4'=>['home'=>0,'guest'=>0],
+                    '5'=>['home'=>0,'guest'=>0],
+                    'all'=>['home'=>0,'guest'=>0],
+                ];
+            }
+            if($ScoreTitle == '第三盘'){
+                $arrs = [
+                    '1'=>['home'=>0,'guest'=>0],
+                    '2'=>['home'=>0,'guest'=>0],
+                    '3'=>['home'=>$home_sorce,'guest'=>$guest_sorce],
+                    '4'=>['home'=>0,'guest'=>0],
+                    '5'=>['home'=>0,'guest'=>0],
+                    'all'=>['home'=>0,'guest'=>0],
+                ];
+            }
+            if($ScoreTitle == '第四盘'){
+                $arrs = [
+                    '1'=>['home'=>0,'guest'=>0],
+                    '2'=>['home'=>0,'guest'=>0],
+                    '3'=>['home'=>0,'guest'=>0],
+                    '4'=>['home'=>$home_sorce,'guest'=>$guest_sorce],
+                    '5'=>['home'=>0,'guest'=>0],
+                    'all'=>['home'=>0,'guest'=>0],
+                ];
+            }
+            if($ScoreTitle == '第五盘'){
+                $arrs = [
+                    '1'=>['home'=>0,'guest'=>0],
+                    '2'=>['home'=>0,'guest'=>0],
+                    '3'=>['home'=>0,'guest'=>0],
+                    '4'=>['home'=>0,'guest'=>0],
+                    '5'=>['home'=>$home_sorce,'guest'=>$guest_sorce],
+                    'all'=>['home'=>0,'guest'=>0],
+                ];
+            }
+          
             $restModel->inning = $arrs;
             $restModel->warn_more = json_decode($restModel->warn_more, 256);
 

app/Models/SportsNoteList.php

@@ -350,41 +350,68 @@ class SportsNoteList extends BaseModel
         if($gameCode == 'wq'){
              //让盘
              $ScoreTitle_rp = commonFunction::checkstr($oddsName, '让盘');
+             //让局
+             $ScoreTitle_rj = commonFunction::checkstr($oddsName, '让局');
              //冠军
              $ScoreTitle_gj = commonFunction::checkstr($oddsName, '冠军');
+             //总局数
+             $ScoreTitle_all_j = commonFunction::checkstr($oddsName, '总局数');
              //波胆
              $ScoreTitle_bd = commonFunction::checkstr($oddsName, '波胆');
              //一盘
-             $ScoreTitle_1 = commonFunction::checkstr($oddsName, '一盘');
+             $ScoreTitle_1 = commonFunction::checkstr($oddsName, '第一盘');
              //二盘
-             $ScoreTitle_2 = commonFunction::checkstr($oddsName, '二盘');
+             $ScoreTitle_2 = commonFunction::checkstr($oddsName, '第二盘');
              //三盘
-             $ScoreTitle_3 = commonFunction::checkstr($oddsName, '三盘');
-             //四盘
-             $ScoreTitle_4 = commonFunction::checkstr($oddsName, '四盘');
- 
+             $ScoreTitle_3 = commonFunction::checkstr($oddsName, '第三盘');
+              //四盘
+              $ScoreTitle_4 = commonFunction::checkstr($oddsName, '第四盘');
+              //五盘
+              $ScoreTitle_5 = commonFunction::checkstr($oddsName, '第五盘');
+
+             //全场 波胆 
              if ($ScoreTitle_bd == 1) {
                  $ScoreTitle = '全场';
              }
-             if ($ScoreTitle_rp == 1) {
-                 $ScoreTitle = '让盘';
+             //只有总局数 全场
+             if($ScoreTitle_all_j == 1 and $ScoreTitle_1 == 0 and $ScoreTitle_2 == 0 and $ScoreTitle_3 == 0 ){
+                $ScoreTitle = '全场';
+             }
+             //只有让盘 全场
+             if($ScoreTitle_rp == 1 and $ScoreTitle_1 == 0 and $ScoreTitle_2 == 0 and $ScoreTitle_3 == 0 ){
+                $ScoreTitle = '全场';
+             }
+             //只有让局 全场
+             if($ScoreTitle_rj == 1 and $ScoreTitle_1 == 0 and $ScoreTitle_2 == 0 and $ScoreTitle_3 == 0 ){
+                $ScoreTitle = '全场';
+             }
+             //只有冠军 全场
+             if($ScoreTitle_gj == 1 and $ScoreTitle_1 == 0 and $ScoreTitle_2 == 0 and $ScoreTitle_3 == 0 ){
+                $ScoreTitle = '全场';
              }
-             if ($ScoreTitle_gj == 1) {
-                 $ScoreTitle = '冠军';
+             //一盘
+             if($ScoreTitle_1 == 1){
+                $ScoreTitle = '第一盘';
              }
-             if ($ScoreTitle_1 == 1) {
-                 $ScoreTitle = '第一盘';
+             //二盘
+             if($ScoreTitle_2 == 1){
+                $ScoreTitle = '第二盘';
              }
-             if ($ScoreTitle_2 == 1) {
-                 $ScoreTitle = '第二盘';
+             //三盘
+             if($ScoreTitle_3 == 1){
+                $ScoreTitle = '第三盘';
              }
-             if ($ScoreTitle_3 == 1) {
-                 $ScoreTitle = '第三盘';
+              //四盘
+              if($ScoreTitle_4 == 1){
+                $ScoreTitle = '第四盘';
              }
-             if ($ScoreTitle_4 == 1) {
-                 $ScoreTitle = '第四盘';
+             //五盘
+             if($ScoreTitle_5 == 1){
+                $ScoreTitle = '第五盘';
              }
- 
+        }
+        if(empty($ScoreTitle)){
+            $ScoreTitle = '未知';
         }
 
         return $ScoreTitle;

resources/views/sports/sports_notelist.blade.php

@@ -565,7 +565,7 @@
                             setScore_v2_bq(res.data.order, res.data.result,res.data.results,order_id, match_id, game_code,ScoreTitle,leagueName,home_team,guest_team);
                             break;
                         case 'wq':
-                            setScore_v2_wq(res.data.order, res.data.result,res.data.results,order_id, match_id, game_code);
+                            setScore_v2_wq(res.data.order, res.data.result,res.data.results,order_id, match_id, game_code,ScoreTitle,leagueName,home_team,guest_team);
                             break;
                     }
                 } else {
@@ -600,9 +600,9 @@
         */
         function setScore_v2_zq(orderObj, resultObj,resultsObj,order_id,match_id,game_code,ScoreTitle,leagueName,home_team,guest_team) {
             //主队比分
-            var home_score;
+            var home_score = 0;
             //客队比分
-            var guest_score;
+            var guest_score = 0;
             //全场
             if(ScoreTitle == '全场'){
                 home_score = resultObj.home_score;
@@ -784,9 +784,9 @@ console.log(matchdata);
             let home = JSON.parse(resultObj.home_score);
             let guest = JSON.parse(resultObj.guest_score);
              //主队比分
-             var home_score;
+             var home_score = 0;
             //客队比分
-            var guest_score;
+            var guest_score = 0;
             //全场
             if(ScoreTitle == '全场'){
                 home_score = home[1]+home[2]+home[3]+home[4];
@@ -933,9 +933,9 @@ console.log(matchdata);
             let match_score = JSON.parse(resultObj.match_score_t);
 
             //主队比分
-            var home_score;
+            var home_score = 0;
             //客队比分
-            var guest_score;
+            var guest_score = 0;
             //全场
             if(ScoreTitle == '全场'){
                 for (let i=1;i<=9;i++){
@@ -943,7 +943,7 @@ console.log(matchdata);
                     guest_score += match_score[i]['guest'];
                 }
             }
-            //上半场
+            //前五局
             if(ScoreTitle == '前五局'){
                 for (let i=1;i<=5;i++){
                     home_score += match_score[i]['home'];
@@ -968,7 +968,7 @@ console.log(matchdata);
             layer.open({
                 area: ['800px', '300px'], //宽高
                 type: 1,
-                title: '设置比分',
+                title: '设置结算比分',
                 content: content, //这里content是一个DOM，注意：最好该元素要存放在body最外层，否则可能被其它的相对元素所影响,
                 btn: ['提交', '取消'],
                 yes: function (index, layero) {
@@ -1002,7 +1002,7 @@ console.log(matchdata);
             return ;
         }
 
-        function setScore_v2_wq(orderObj, resultObj,order_id,match_id,game_code) {
+        function __setScore_v2_wq(orderObj, resultObj,order_id,match_id,game_code) {
             let match_score = JSON.parse(resultObj.inning);
 
             let content = '<div style="width: 100%;height:25px;"></div><div class="layui-form-item">' +
@@ -1058,6 +1058,91 @@ console.log(matchdata);
 
             return ;
         }
+        function setScore_v2_wq(orderObj, resultObj,resultsObj,order_id,match_id,game_code,ScoreTitle,leagueName,home_team,guest_team) {
+            let match_score = JSON.parse(resultObj.inning);
+
+             //主队比分
+             var home_score = 0;
+            //客队比分
+            var guest_score = 0;
+            //全场
+            if(ScoreTitle == '全场'){
+                for (let i=1;i<=5;i++){
+                    home_score += match_score[i]['home'];
+                    guest_score += match_score[i]['guest'];
+                }
+            }
+            //一盘
+            if(ScoreTitle == '第一盘'){
+                home_score += match_score[1]['home'];
+                guest_score += match_score[1]['guest'];
+            }
+             //二盘
+             if(ScoreTitle == '第二盘'){
+                home_score += match_score[2]['home'];
+                guest_score += match_score[2]['guest'];
+            }
+             //三盘
+             if(ScoreTitle == '第三盘'){
+                home_score += match_score[3]['home'];
+                guest_score += match_score[3]['guest'];
+            }
+             //四盘
+             if(ScoreTitle == '第四盘'){
+                home_score += match_score[4]['home'];
+                guest_score += match_score[4]['guest'];
+            }
+             //五盘
+             if(ScoreTitle == '第五盘'){
+                home_score += match_score[5]['home'];
+                guest_score += match_score[5]['guest'];
+            }
+
+            let content = '<div style="width: 100%;height:25px;"></div><div class="layui-form-item">' ;
+
+            content += '  <div class="layui-inline" style="width: -webkit-fill-available;height: 80px;">' +
+                    '    <label class="layui-form-label" style="text-align:center;width: -webkit-fill-available;height: 25px;">'+leagueName+'</label><br></br>' +
+                    '    <label class="layui-form-label"  style="width:200px;">'+home_team+'-（'+ScoreTitle+'）</label>' +
+                    '    <div class="layui-input-inline" style="width: 50px;">' +
+                    '      <input type="text" name="set_zq_home_score" id="set_wq_home_score" placeholder="主"  value="' + home_score +'"  required   autocomplete="off" class="layui-input">' +
+                    '    </div>' +
+                    '    <label class="layui-form-label"  style="width:200px;">'+guest_team+'-（'+ScoreTitle+'）</label>' +
+                    '    <div class="layui-input-inline" style="width: 50px;">' +
+                    '      <input type="text" name="set_zq_home_score" id="set_wq_guest_score" placeholder="主"  value="' + guest_score +'"  required   autocomplete="off" class="layui-input">' +
+                    '    </div>' +
+                    '  </div>' ;
+
+            layer.open({
+                area: ['800px', '300px'], //宽高
+                type: 1,
+                title: '设置结算比分',
+                content: content, //这里content是一个DOM，注意：最好该元素要存放在body最外层，否则可能被其它的相对元素所影响,
+                btn: ['提交', '取消'],
+                yes: function (index, layero) {
+                    var home = $("#set_wq_home_score").val();
+                    var guest = $("#set_wq_guest_score").val();
+
+                    let home_scores=[],guest_scores=[],str_home,str_guest,i;
+                    for (i=0;i<=8;i++){
+                        str_home = '#set_wq_home_score';
+                        str_guest = '#set_wq_guest_score';
+                        home_scores.push($(str_home).val());
+                        guest_scores.push($(str_guest).val());
+                    }
+
+                    matchdata = JSON.stringify({
+                        'home':home_scores,
+                        'guest':guest_scores
+                    });
+
+                    // 请求设置接口
+                    ajax_setScore_all_v2(order_id,game_code,match_id,matchdata,ScoreTitle,home,guest);
+                    return true;
+                },
+            });
+
+            return ;
+        }
         function  ajax_setScore_all_v2(order_id, game_code, match_id, matchdata,ScoreTitle,home,guest){
             // 请求设置接口
             $.ajax({