Jimy 6 년 전
부모
커밋
9db91430a9
2개의 변경된 파일86개의 추가작업 그리고 21개의 파일을 삭제
  1. 25 3
      app/Http/Controllers/Admin/SportsfootController.php
  2. 61 18
      resources/views/admin/sportsfoot/outcome.blade.php

+ 25 - 3
app/Http/Controllers/Admin/SportsfootController.php

@@ -54,12 +54,28 @@ class SportsfootController extends Controller {
 	function addend(Req $req){
 	function addend(Req $req){
 		$match_id = $req->input('match_id');
 		$match_id = $req->input('match_id');
 		$model = \App\Models\Stzqresult::where('match_id', $match_id)->first();
 		$model = \App\Models\Stzqresult::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->first_score = $req->firstscore;
 		$model->last_score = $req->lastscore;
 		$model->last_score = $req->lastscore;
 		$model->match_winer = $req->matchwiner;
 		$model->match_winer = $req->matchwiner;
 		$model->u_home_score = $req->uhomescore;
 		$model->u_home_score = $req->uhomescore;
-		$model->u_guest_score = $req->uguestscore;           
-	   
+		$model->u_guest_score = $req->uguestscore;
+		$model->penalty_card = json_encode($penaltycard);
+		$model->corner_ball = json_encode($cornerball);
+
         $model->save();
         $model->save();
         return responseToJson(1);
         return responseToJson(1);
 	}
 	}
@@ -68,7 +84,13 @@ class SportsfootController extends Controller {
 	function Matchresult(Req $req){
 	function Matchresult(Req $req){
 		$match_id = $req->match_id;
 		$match_id = $req->match_id;
 		$newapp = \App\Models\Stzqresult::where('match_id', $match_id)->first();
 		$newapp = \App\Models\Stzqresult::where('match_id', $match_id)->first();
-		return $newapp;
+
+		$array =array(
+			'corner_ball' => json_decode($newapp['corner_ball'],true),
+			'penalty_card' => json_decode($newapp['penalty_card'],true),
+			'newapp' => $newapp,
+		);
+		return $array;
 	}
 	}
 
 
 	//结算
 	//结算

+ 61 - 18
resources/views/admin/sportsfoot/outcome.blade.php

@@ -282,19 +282,46 @@
                 </div>
                 </div>
                 <div class="modal-body">
                 <div class="modal-body">
                     <p style="text-align:left;">请认真填写赛事结果,将会按照改结果结算</p><br>
                     <p style="text-align:left;">请认真填写赛事结果,将会按照改结果结算</p><br>
-                    <div style="float:left">
-                        <p>最先进球球队:</p>
-                        <p>最后进球球队:</p>
-                        <p>获 胜 球 队:</p>
-                        <p>上主队进球数:</p>
-                        <p>上客队进球数:</p>
-                    </div>
                     <div style="text-align:left;">
                     <div style="text-align:left;">
-                        <input type="text" id="firstscore" name="firstscore" value=""><br>
-                        <input type="text" id="lastscore" name="lastscore" value=""><br>
-                        <input type="text" id="matchwiner" name="matchwiner" value=""><br>
-                        <input type="text" id="uhomescore" name="uhomescore" value=""><br>
-                        <input type="text" id="uguestscore" name="uguestscore" value=""><br>
+                        <div style="display: flex;">
+                            <li>最先进球球队:</li><input type="text" id="firstscore" name="firstscore" value="">
+                        </div>
+                        <div style="display: flex;">
+                            <li>最后进球球队:</li><input type="text" id="lastscore" name="lastscore" value="">
+                        </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="uhomescore" name="uhomescore" value="">
+                        </div>
+                        <div style="display: flex;">
+                            <li>上客队进球数:</li><input type="text" id="uguestscore" name="uguestscore" value="">
+                        </div>
+                        <div style="display: flex;">
+                            <li>主队全场角球:</li><input type="text" id="homeallcard" name="homeallcard" value="">
+                        </div>
+                        <div style="display: flex;">
+                            <li>客队全场角球:</li><input type="text" id="guestallcard" name="guestallcard" value="">
+                        </div>
+                        <div style="display: flex;">
+                            <li>主队半场角球:</li><input type="text" id="homehalfcard" name="homehalfcard" value="">
+                        </div>
+                        <div style="display: flex;">
+                            <li>客队半场角球:</li><input type="text" id="guesthalfcard" name="guesthalfcard" value="">
+                        </div>
+                        <div style="display: flex;">
+                            <li>主队全场罚牌:</li><input type="text" id="homeallcorner" name="homeallcorner" value="">
+                        </div>
+                        <div style="display: flex;">
+                            <li>客队全场罚牌:</li><input type="text" id="guestallcorner" name="guestallcorner" value="">
+                        </div>
+                        <div style="display: flex;">
+                            <li>主队半场罚牌:</li><input type="text" id="homehalfcorner" name="homehalfcorner" value="">
+                        </div>
+                        <div style="display: flex;">
+                            <li>客队半场罚牌:</li><input type="text" id="guesthalfcorner" name="guesthalfcorner" value="">
+                        </div>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="modal-footer">
                 <div class="modal-footer">
@@ -330,11 +357,19 @@
                 url: '/admin/Sportsfoot/Matchresult',
                 url: '/admin/Sportsfoot/Matchresult',
                 data: {match_id:match_id},
                 data: {match_id:match_id},
                 success: function(data) {
                 success: function(data) {
-                    document.getElementById("firstscore").value=data.first_score;
-                    document.getElementById("lastscore").value=data.last_score;
-                    document.getElementById("matchwiner").value=data.match_winer;
-                    document.getElementById("uhomescore").value=data.u_home_score;
-                    document.getElementById("uguestscore").value=data.u_guest_score;
+                    document.getElementById("firstscore").value=data.newapp.first_score;
+                    document.getElementById("lastscore").value=data.newapp.last_score;
+                    document.getElementById("matchwiner").value=data.newapp.match_winer;
+                    document.getElementById("uhomescore").value=data.newapp.u_home_score;
+                    document.getElementById("uguestscore").value=data.newapp.u_guest_score;
+                    document.getElementById("homeallcard").value=data.corner_ball.home;
+                    document.getElementById("guestallcard").value=data.corner_ball.guest;
+                    document.getElementById("homehalfcard").value=data.corner_ball.home_half;
+                    document.getElementById("guesthalfcard").value=data.corner_ball.guest_half;
+                    document.getElementById("homeallcorner").value=data.penalty_card.home;
+                    document.getElementById("guestallcorner").value=data.penalty_card.guest;
+                    document.getElementById("homehalfcorner").value=data.penalty_card.home_half;
+                    document.getElementById("guesthalfcorner").value=data.penalty_card.guest_half;
                 }
                 }
             })
             })
 
 
@@ -380,12 +415,20 @@
             var matchwiner = $("#matchwiner").val();
             var matchwiner = $("#matchwiner").val();
             var uhomescore = $("#uhomescore").val();
             var uhomescore = $("#uhomescore").val();
             var uguestscore = $("#uguestscore").val();
             var uguestscore = $("#uguestscore").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();
 
 
             $.ajax({
             $.ajax({
                 type: 'POST',
                 type: 'POST',
                 dataType: 'json',
                 dataType: 'json',
                 url: '/admin/Sportsfoot/addend',
                 url: '/admin/Sportsfoot/addend',
-                data: {match_id:match_id,firstscore:firstscore,lastscore:lastscore,matchwiner:matchwiner,uhomescore:uhomescore,uguestscore:uguestscore},
+                data: {match_id:match_id,firstscore:firstscore,lastscore:lastscore,matchwiner:matchwiner,uhomescore:uhomescore,uguestscore:uguestscore,homeallcard:homeallcard,guestallcard:guestallcard,homehalfcard:homehalfcard,guesthalfcard:guesthalfcard,homeallcorner:homeallcorner,guestallcorner:guestallcorner,homehalfcorner:homehalfcorner,guesthalfcorner:guesthalfcorner},
                 success: function(data) {
                 success: function(data) {
                     
                     
                     if(data.status==1){
                     if(data.status==1){