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

app/Http/Controllers/Admin/SportsBaseController.php

@@ -231,7 +231,7 @@ class SportsBaseController extends Controller {
                 }
             }
             if($data->status == 2){
-                $match_status =array(['status'=>2,'name'=>'已结束'],['status'=>5,'name'=>'待结算'],['status'=>3,'name'=>'已结算'],['status'=>4,'name'=>'作废']);
+                $match_status =array(['status'=>2,'name'=>'已结束'],['status'=>4,'name'=>'作废']);
             }
             if($data->status == 3){
                 $match_status =array(['status'=>3,'name'=>'已结算'],['status'=>5,'name'=>'待结算']);

app/Http/Controllers/Admin/SportsBasketController.php

@@ -232,7 +232,7 @@ class SportsBasketController extends Controller {
 				}
 			}
 			if($data->status == 2){
-				$match_status =array(['status'=>2,'name'=>'已结束'],['status'=>5,'name'=>'待结算'],['status'=>3,'name'=>'已结算'],['status'=>4,'name'=>'作废']);
+				$match_status =array(['status'=>2,'name'=>'已结束'],['status'=>4,'name'=>'作废']);
 			}
 			if($data->status == 3){
 				$match_status =array(['status'=>3,'name'=>'已结算'],['status'=>5,'name'=>'待结算']);

app/Http/Controllers/Admin/SportsSoccerController.php

@@ -230,7 +230,7 @@ class SportsSoccerController extends Controller {
                 }
             }
             if($data->status == 2){
-                $match_status =array(['status'=>2,'name'=>'已结束'],['status'=>5,'name'=>'待结算'],['status'=>3,'name'=>'已结算'],['status'=>4,'name'=>'作废']);
+                $match_status =array(['status'=>2,'name'=>'已结束'],['status'=>4,'name'=>'作废']);
             }
             if($data->status == 3){
                 $match_status =array(['status'=>3,'name'=>'已结算'],['status'=>5,'name'=>'待结算']);

app/Http/Controllers/Admin/SportsTennisController.php

@@ -232,7 +232,7 @@ class SportsTennisController extends Controller {
                 }
             }
             if($data->status == 2){
-                $match_status =array(['status'=>2,'name'=>'已结束'],['status'=>5,'name'=>'待结算'],['status'=>3,'name'=>'已结算'],['status'=>4,'name'=>'作废']);
+                $match_status =array(['status'=>2,'name'=>'已结束'],['status'=>4,'name'=>'作废']);
             }
             if($data->status == 3){
                 $match_status =array(['status'=>3,'name'=>'已结算'],['status'=>5,'name'=>'待结算']);

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

@@ -108,8 +108,8 @@
                     <div class="layui-inline">
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('lq')">ဂ</i></a>
-                        @if(checkRriv('/admin/sportsbk/addoutcome'))<a href="/admin/sportsbk/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif
+                        <a class="layui-btn layui-btn-xs" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('lq')">刷新赛事</i></a>
+                        <!-- @if(checkRriv('/admin/sportsbk/addoutcome'))<a href="/admin/sportsbk/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif -->
                         @if(checkRriv('/admin/sportsbk/deleteoutcome'))<a href="javascript:delWin('/admin/sportsbk/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>
                 </div>

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

@@ -330,7 +330,7 @@
 		function addResult($match_id){
             var match_id = $match_id;
             document.getElementById("match_id").value=$match_id;//赋值个弹窗
-
+            $(":input").val(""); 
             $.ajax({
                 type: 'POST',
                 dataType: 'json',