结算相关

app/Http/Controllers/Admin/SportswqController.php

@@ -205,9 +205,7 @@ class SportswqController extends Controller {
 		$newapp = \App\Models\Stwqresult::where('match_id', $match_id)->first();
 
 		$array =array(
-			'corner_ball' => json_decode($newapp['corner_ball'],true),
-			'penalty_card' => json_decode($newapp['penalty_card'],true),
-			'newapp' => $newapp,
+			'wqresult' => $newapp,
 		);
 		return $array;
 	}
@@ -222,25 +220,9 @@ class SportswqController extends Controller {
 	function addend(Req $req){
 		$match_id = $req->matchid;
 		$model = \App\Models\Stwqresult::where('match_id', $match_id)->first();
-
-		$penaltycard = array(
-        	'home'=>intval($req->homeallcard)?intval($req->homeallcard):0,
-        	'guest'=>intval($req->guestallcard)?intval($req->guestallcard):0,
-        	'home_half'=>intval($req->homehalfcard)?intval($req->homehalfcard):0,
-        	'guest_half'=>intval($req->guesthalfcard)?intval($req->guesthalfcard):0,
-        );
-        $cornerball = array(
-        	'home'=>intval($req->homeallcorner)?intval($req->homeallcorner):0,
-        	'guest'=>intval($req->guestallcorner)?intval($req->guestallcorner):0,
-        	'home_half'=>intval($req->homehalfcorner)?intval($req->homehalfcorner):0,
-        	'guest_half'=>intval($req->guesthalfcorner)?intval($req->guesthalfcorner):0,
-        );
-
-		$model->first_score = $req->firstscore;
-		$model->last_score = $req->lastscore;
-		$model->match_winer = $req->matchwiner;
-		$model->penalty_card = json_encode($penaltycard);
-		$model->corner_ball = json_encode($cornerball);
+		$model->first_score_player = $req->first_score_player?$req->first_score_player:0;
+		$model->last_score_player = $req->last_score_player?$req->last_score_player:0;
+		$model->match_winer_player = $req->match_winer_player?$req->match_winer_player:0;
 
         $model->save();
         return responseToJson(1);

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

@@ -52,7 +52,7 @@
         background-color: #fefefe;
         margin: auto;
         padding: 260px auto;
-        width: 600px;
+        width: 800px;
         box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19);
         -webkit-animation-name: animatetop;
         -webkit-animation-duration: 0.4s;
@@ -106,7 +106,7 @@
         display: flex;
         justify-content: space-around;
         align-items: center;
-        width: 520px;
+        width: 720px;
         padding: 0 40px;
         height: 50px;
        border-radius:0 0 5px 5px;
@@ -246,7 +246,24 @@
                 <div class="modal-body">
                     <p style="text-align:left;color:#5f7788;">请认真填写赛事结果,将会按照改结果结算</p><br>
                     <div style="text-align:left;">
-                        <div style="display:flex">
+                        
+                        <div style="display: flex;">
+                            <li>最先得分队员：</li>
+                            <select name="firstscoreplayer" id="firstscoreplayer">
+                            </select>
+                        </div>
+                        <div style="display: flex;">
+                            <li>最后得分队员：</li>
+                            <select name="lastscoreplayer" id="lastscoreplayer">
+                            </select>
+                        </div>
+                        <div style="display: flex;">
+                            <li>获胜球队队员：</li>
+                            <select name="matchwinerplayer" id="matchwinerplayer">
+                            </select>
+                        </div>
+
+                        <!-- <div style="display:flex">
                             <li style="width: 110px;">第一局获胜队</li>
                             <div id="onegame">
                                 <input type="radio" name="onegame" value="" checked>主队
@@ -308,7 +325,8 @@
                                 <input type="radio" name="ninegame" value="1" checked>主队
                                 <input type="radio" name="ninegame" value="0" >客队
                             </div>
-                        </div>
+                        </div> -->
+
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -344,21 +362,43 @@
                 url: '/admin/Sportswq/Matchresult',
                 data: {match_id:match_id},
                 success: function(data) {
-                    document.getElementById("matchwiner").value=data.newapp.match_winer;
-                    document.getElementById("homeallcard").value=data.penalty_card.home;
-                    document.getElementById("guestallcard").value=data.penalty_card.guest;
-                    document.getElementById("homehalfcard").value=data.penalty_card.home_half;
-                    document.getElementById("guesthalfcard").value=data.penalty_card.guest_half;
-                    document.getElementById("homeallcorner").value=data.corner_ball.home;
-                    document.getElementById("guestallcorner").value=data.corner_ball.guest;
-                    document.getElementById("homehalfcorner").value=data.corner_ball.home_half;
-                    document.getElementById("guesthalfcorner").value=data.corner_ball.guest_half;
-
-                    addqd = "<option value='' selected=''>请选择最后进球</option><option value=" +data.newapp.home_team + ">" + data.newapp.home_team + "</option><option value=" +data.newapp.guest_team + ">" + data.newapp.guest_team + "</option>";
-                    $("#addqd").html(addqd);
-
-                    addzd = "<option value='' selected=''>请选择最后进球</option><option value=" + data.newapp.home_team + ">" + data.newapp.home_team + "</option><option value=" + data.newapp.guest_team + ">" + data.newapp.guest_team + "</option>";
-                    $("#addzd").html(addzd);
+                    // alert(data.wqresult);
+                    // document.getElementById("matchwiner").value=data.newapp.match_winer;
+                    // document.getElementById("homeallcard").value=data.penalty_card.home;
+                    // document.getElementById("guestallcard").value=data.penalty_card.guest;
+                    // document.getElementById("homehalfcard").value=data.penalty_card.home_half;
+                    // document.getElementById("guesthalfcard").value=data.penalty_card.guest_half;
+                    // document.getElementById("homeallcorner").value=data.corner_ball.home;
+                    // document.getElementById("guestallcorner").value=data.corner_ball.guest;
+                    // document.getElementById("homehalfcorner").value=data.corner_ball.home_half;
+                    // document.getElementById("guesthalfcorner").value=data.corner_ball.guest_half;
+
+                    firstscoreplayer = "<option value='"+data.wqresult.first_score_player+"' selected=''>";
+                    if (data.wqresult.first_score_player != 0){
+                        firstscoreplayer += data.wqresult.first_score_player;
+                    }else{
+                        firstscoreplayer += '请选择最先进球';
+                    }
+                    firstscoreplayer += "</option><option value=" + data.wqresult.home_player_name + ">" + data.wqresult.home_player_name + "</option><option value=" + data.wqresult.guest_player_name + ">" + data.wqresult.guest_player_name + "</option>";
+                    $("#firstscoreplayer").html(firstscoreplayer);
+
+                    lastscoreplayer = "<option value='"+data.wqresult.last_score_player+"' selected=''>";
+                    if (data.wqresult.last_score_player  != 0){
+                        lastscoreplayer += data.wqresult.last_score_player;
+                    }else{
+                        lastscoreplayer += '请选择最后进球';
+                    }
+                    lastscoreplayer += "</option><option value=" + data.wqresult.home_player_name + ">" + data.wqresult.home_player_name + "</option><option value=" + data.wqresult.guest_player_name + ">" + data.wqresult.guest_player_name + "</option>";
+                    $("#lastscoreplayer").html(lastscoreplayer);
+
+                    matchwinerplayer = "<option value='"+data.wqresult.match_winer_player+"' selected=''>";
+                    if (data.wqresult.match_winer_player  != 0){
+                        matchwinerplayer += data.wqresult.match_winer_player;
+                    }else{
+                        matchwinerplayer += '请选择最后胜利队员';
+                    }
+                    matchwinerplayer += "</option><option value=" + data.wqresult.home_player_name + ">" + data.wqresult.home_player_name + "</option><option value=" + data.wqresult.guest_player_name + ">" + data.wqresult.guest_player_name + "</option>";
+                    $("#matchwinerplayer").html(matchwinerplayer);
                 }
             }) 
 
@@ -399,52 +439,20 @@
         
         function buttonClick(){
             var matchid = $("#matchid").val();
-            var firstscore = $("#firstscore").val();
-            var lastscore = $("#lastscore").val();
-            var matchwiner = $("#matchwiner").val();
-            var homeallcard = $("#homeallcard").val();
-            var guestallcard = $("#guestallcard").val();
-            var homehalfcard = $("#homehalfcard").val();
-            var guesthalfcard = $("#guesthalfcard").val();
-            var homeallcorner = $("#homeallcorner").val();
-            var guestallcorner = $("#guestallcorner").val();
-            var homehalfcorner = $("#homehalfcorner").val();
-            var guesthalfcorner = $("#guesthalfcorner").val();
-            var reg = /^[0-99]\d*$/;
-          
+            var first_score_player = $("#firstscoreplayer").val();
+            var last_score_player = $("#lastscoreplayer").val();
+            var match_winer_player = $("#matchwinerplayer").val();
+
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
-                url: '/admin/Sportswq/onlyresult',
-                data: {matchid:matchid},
+                url: '/admin/Sportswq/addend',
+                data: {matchid:matchid,first_score_player:first_score_player,last_score_player:last_score_player,match_winer_player:match_winer_player},
                 success: function(data) {
-                    var allnum = data.home_score+ data.guest_score;
-                   
-                    if(allnum>0){
-                        if(firstscore.length==0){ 
-                            alert("请输入最先进球");return;
-                        }
-                        if(lastscore.length==0){ 
-                            alert("请输入最后进球");return;
-                        }
-                    }
-
-                    $.ajax({
-                            type: 'POST',
-                            dataType: 'json',
-                            url: '/admin/Sportswq/addend',
-                            data: {matchid:matchid,firstscore:firstscore,lastscore:lastscore,matchwiner:matchwiner,homeallcard:homeallcard,guestallcard:guestallcard,homehalfcard:homehalfcard,guesthalfcard:guesthalfcard,homeallcorner:homeallcorner,guestallcorner:guestallcorner,homehalfcorner:homehalfcorner,guesthalfcorner:guesthalfcorner},
-                            success: function(data) {
-                                
-                                
-                                    layer.msg(data.msg);
-                                    location. reload()//刷新当前页面
-                                
-                            }
-                        })
+                    layer.msg(data.msg);
+                    location. reload()//刷新当前页面
                 }
             })
-            
         }
 
         //刷新赛事数据