Merge branch 'master' of http://git.bocai108.com:10180/aqm/sports_admin

app/Http/Controllers/Admin/SportsfootController.php

@@ -71,8 +71,6 @@ class SportsfootController extends Controller {
 		$model->first_score = $req->firstscore;
 		$model->last_score = $req->lastscore;
 		$model->match_winer = $req->matchwiner;
-		$model->u_home_score = $req->uhomescore;
-		$model->u_guest_score = $req->uguestscore;
 		$model->penalty_card = json_encode($penaltycard);
 		$model->corner_ball = json_encode($cornerball);
 

app/Models/SportsNoteList.php

@@ -247,7 +247,7 @@ class SportsNoteList extends BaseModel {
         return $data;
     }
 
-     //修改赛事下的所有单式下注 3199308
+    //修改赛事下的所有单式下注 3199308
     function updatesimplex($ssid,$code){
         $newapp = new \App\Models\MoneyBuyMatch();
         $data = $newapp->allsimplexorder($ssid,$code);
@@ -256,6 +256,7 @@ class SportsNoteList extends BaseModel {
                 $the = array(
                     'status' => 2,
                     'game_status' => 3,
+                    'game_code' =>$code,
                 );
                 $res = $this->where('order_id',$data[$i]['order_id'])->update($the);
             }

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

@@ -289,8 +289,6 @@
                     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.penalty_card.home;
                     document.getElementById("guestallcard").value=data.penalty_card.guest;
                     document.getElementById("homehalfcard").value=data.penalty_card.home_half;
@@ -300,7 +298,7 @@
                     document.getElementById("homehalfcorner").value=data.corner_ball.home_half;
                     document.getElementById("guesthalfcorner").value=data.corner_ball.guest_half;
                 }
-            })
+            }) 
 
             //获取弹窗得div
             var modal = document.getElementById('myModal');
@@ -342,8 +340,6 @@
             var firstscore = $("#firstscore").val();
             var lastscore = $("#lastscore").val();
             var matchwiner = $("#matchwiner").val();
-            var uhomescore = $("#uhomescore").val();
-            var uguestscore = $("#uguestscore").val();
             var homeallcard = $("#homeallcard").val();
             var guestallcard = $("#guestallcard").val();
             var homehalfcard = $("#homehalfcard").val();
@@ -357,7 +353,7 @@
                 type: 'POST',
                 dataType: 'json',
                 url: '/admin/Sportsfoot/addend',
-                data: {matchid:matchid,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},
+                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) {
                     
                     if(data.status==1){
@@ -593,12 +589,6 @@ $('.lay-btn-diy').on('click', function(){
                         <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=""  autocomplete="off">
-                        </div>
-                        <div style="display: flex;">
-                            <li>上客队进球数：</li><input type="text" id="uguestscore" name="uguestscore" value="" autocomplete="off">
-                        </div>
                         <div style="display: flex;">
                             <li>主队全场角球：</li><input type="text" id="homeallcorner" name="homeallcorner" value="" autocomplete="off">
                         </div>