4 İşlemeler 0cf0a24f51 ... 3f85a4611e

Yazar SHA1 Mesaj Tarih
  Jimy 3f85a4611e upd 6 yıl önce
  Jimy 07fa750e65 Merge branch 'master' 6 yıl önce
  Jimy 32523ea56a Merge branch 'master' 6 yıl önce
  Jimy cc485c046a upd 6 yıl önce

+ 10 - 8
app/Http/Controllers/Admin/SportsfootController.php

@@ -215,14 +215,16 @@ class SportsfootController extends Controller {
 		if (!empty($name_chinese)) {
 			$where[] = array('st_zq_league.name_chinese', '=', $name_chinese);
 		}
-		if (!empty($star_time)) {
-            $star_time = date('Y-m-d H:i:s', strtotime($star_time));
-            $where[] = array('st_zq_result.start_time', '>', $star_time);
-        }
-        if (!empty($end_time)) {
-            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
-            $where[] = array('st_zq_result.start_time', '<', $end_time);
-        }
+		if(!is_numeric($home_team)){
+			if (!empty($star_time)) {
+	            $star_time = date('Y-m-d H:i:s', strtotime($star_time));
+	            $where[] = array('st_zq_result.start_time', '>', $star_time);
+	        }
+	        if (!empty($end_time)) {
+	            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
+	            $where[] = array('st_zq_result.start_time', '<', $end_time);
+	        }
+	    }
         $newapp = new \App\Models\Stzqresult();
         $data = $newapp->resultlist($list, $page, $where, $orwhere);
         

+ 20 - 30
resources/views/admin/sportsfoot/outcome.blade.php

@@ -286,8 +286,6 @@
                 url: '/admin/Sportsfoot/Matchresult',
                 data: {match_id:match_id},
                 success: function(data) {
-                    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("homeallcard").value=data.penalty_card.home;
                     document.getElementById("guestallcard").value=data.penalty_card.guest;
@@ -297,6 +295,12 @@
                     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);
                 }
             }) 
 
@@ -335,10 +339,6 @@
             }
         }
         
-        function requests(match_id){
-            
-        }
-        
         function buttonClick(){
             var matchid = $("#matchid").val();
             var firstscore = $("#firstscore").val();
@@ -361,17 +361,13 @@
                 data: {matchid:matchid},
                 success: function(data) {
                     var allnum = data.home_score+ data.guest_score;
-                    // alert(firstscore.length);die;
+                   
                     if(allnum>0){
                         if(firstscore.length==0){ 
                             alert("请输入最先进球");return;
-                            // layer.msg('请输入最先进球');
-                            // reloadDataTable();return;
                         }
                         if(lastscore.length==0){ 
                             alert("请输入最后进球");return;
-                            // layer.msg('请输入最后进球');
-                            // reloadDataTable();return;
                         }
                     }
 
@@ -391,26 +387,10 @@
                 }
             })
             
-
-
-            // $.ajax({
-            //     type: 'POST',
-            //     dataType: 'json',
-            //     url: '/admin/Sportsfoot/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) {
-                    
-            //         if(data.status==1){
-            //             layer.msg(data.msg);
-            //             location. reload()//刷新当前页面
-            //         }
-            //     }
-            // })
-
-
         }
 
 
+
         //刷新赛事数据
         function refreshall(game_code){ 
             var game_code = game_code;
@@ -627,11 +607,21 @@ $('.lay-btn-diy').on('click', function(){
                     <p style="text-align:left;color:#5f7788;">请认真填写赛事结果,将会按照改结果结算</p><br>
                     <div style="text-align:left;">
                         <div style="display: flex;">
-                            <li>最先进球球队:</li><input type="text" id="firstscore" name="firstscore" value="">
+                            <li>最先进球球队:</li>
+                            <select name="firstscore" id="addqd">
+                            </select>
                         </div>
                         <div style="display: flex;">
-                            <li>最后进球球队:</li><input type="text" id="lastscore" name="lastscore" value="">
+                            <li>最后进球球队:</li>
+                            <select name="lastscore" id="addzd">
+                            </select>
+                        </div>
+                        <!-- <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>