彭俊 vor 6 Jahren
Ursprung
Commit
39dc1acf2e

+ 139 - 4
app/Http/Model/StLqResult.php

@@ -16,19 +16,21 @@ class StLqResult extends Model
 
     /*
      * 写赛事结果
+     * 弃用
      */
-    public static function LQresult($model){
+    public static function LQresult___($model){
+        dd(123);
         //获取赛事表7天内所有赛事
         $matchData = $model['model_match']::select('id','home_team','guest_team','lg_id','status','tag','match_date','match_time')
-            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-7 day"))]])
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-1 day"))]])
             ->get()
             ->toarray();
 
         //没有数据,无需操作
         if(empty($matchData)) return Response::success();
-        //获取赛事结果表 15天内
+        //获取赛事结果表 15天内 
         $matchData_r = $model['model_result']::select('match_id')
-            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-7 day"))]])
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-1 day"))]])
             ->get()
             ->toarray();
         //结果表无数据,直接插入
@@ -101,6 +103,139 @@ class StLqResult extends Model
         }
     }
 
+    /*
+     * 写赛事结果
+     */
+    public static function LQresult($model){
+        //获取当天开始并且已结束的所有赛事
+        $matchData = $model['model_match']::select('id','home_team','guest_team','lg_id','status','tag','match_date','match_time')
+            ->where([['match_date','=',date('Y-m-d', time())],['status','=',2]])
+            ->get()
+            ->toArray();
+
+        //获取赛事结果表 一天内
+        $matchData_r = $model['model_result']::select('match_id')
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-1 day"))]])
+            ->get()
+            ->toarray();
+
+
+        if(!empty($matchData_r)){
+            //如果结果表有数据,则获取结果表没有的赛事
+            foreach ($matchData as $k => $v) {
+                foreach ($matchData_r as $kk => $vv) {
+                    if ($v['id'] == $vv['match_id']) {
+                        unset($matchData[$k]);
+                    }
+                }
+            }
+
+        }
+
+        //没有数据,无需操作
+        if(empty($matchData)) return Response::success();
+        
+        //获取赛事id 用于获取赛事对应结果比分
+        $match_ids = [];
+        foreach($matchData as $k =>$v){
+            //只获取赛事已结束的
+            if($v['status'] == 2){
+                $match_ids[] = $v['id'];
+            }
+        }
+
+        $match_ids_str = implode(",", $match_ids);
+        
+        //上半场
+        $sql_h = "select a.match_id,a.home_score,a.guest_score,a.match_time as a_time,a.match_process,a.all_goal,a.first_score,a.last_score,a.match_score,a.match_winer from st_lq_result_record a,
+        (select match_id,max(id) id from st_zq_result_record where match_process = '上半场' and match_id IN ($match_ids_str) group by match_id)b
+        where a.match_id = b.match_id and a.id = b.id ";
+
+        //全场
+        $sql_f = "select a.match_id,a.home_score,a.guest_score,a.match_time as a_time,a.match_process,a.all_goal,a.first_score,a.last_score,a.match_score,a.match_winer,a.home_rate,a.guest_rate from st_lq_result_record a,
+        (select match_id,max(id) id from st_zq_result_record where match_id IN ($match_ids_str) group by match_id)b
+        where a.match_id = b.match_id and a.id = b.id ";
+
+        //上半场最终结果
+        $match_result_h = DB::select($sql_h);
+
+        //全场最终结果
+        $match_result_f = DB::select($sql_f);
+        //拼装赛事结果数据
+        $match_result_record = [];
+        if(!empty($match_result_h) and !empty($match_result_f)){
+            foreach($match_result_h as $k=>$v){
+                foreach($match_result_f as $kk=>$vv){
+                    if($v->match_id == $vv->match_id){
+                        $match_result_record[$k] = [
+                            "match_id"=>$v->match_id,
+                            "home_score"=> $vv->home_score,
+                            "guest_score"=> $vv->guest_score,
+                            "a_time"=> $vv->a_time,
+                            "match_process"=> $vv->match_process,
+                            "all_goal"=> $vv->all_goal,
+                            "first_score"=> $vv->first_score,
+                            "last_score"=> $vv->last_score,
+                            "match_score"=> $vv->match_score,
+                            "match_winer"=> $vv->match_winer,
+                            "u_home_score"=> $v->home_score,
+                            "u_guest_score"=> $v->guest_score,
+                            "home_rate"=> $vv->home_rate,
+                            "guest_rate"=> $vv->guest_rate,
+                        ];
+                    }
+                }
+            }
+        }
+        
+
+        //组装赛果数据
+        if(!empty($match_result_record)){
+            foreach ($matchData as $k=>$v){
+                $start_time = ($v['match_date'].' '.$v['match_time']);
+                $time = time()-strtotime($v['match_time']);
+                $match_time = self::secTime($time);
+                foreach($match_result_record as $kk =>$vv){        
+                    if($v['id'] == $vv['match_id']){
+                        $set_match_r[] = [
+                            "match_id"=> $v['id'],
+                            "home_team"=>$v['home_team'],
+                            "guest_team"=>$v['guest_team'],
+                            "lg_id"=>$v['lg_id'],
+                            "status"=>$v['status'],
+                            "tag"=> $v['tag'],
+                            'match_time'=>$vv['a_time']?:0,//比赛进行时间
+                            "ctime"=>date('Y-m-d H:i:s'),
+                            "update_time"=>date('Y-m-d H:i:s'),
+                            "start_time"=>date('Y-m-d H:i:s',strtotime($start_time)),
+
+                            "home_rate"=> $vv['home_rate']?:0, //主队让球
+                            "guest_rate"=> $vv['guest_rate']?:0, //客队让球
+                            "home_score"=> $vv['home_score']?:0, //主队进球数
+                            "guest_score"=> $vv['guest_score']?:0, //客队进球数
+                            "all_goal"=> $vv['all_goal']?:0, //总进球数
+                            "first_score"=> $vv['first_score']?:'', //最先进球球队
+                            "last_score"=> $vv['last_score']?:'', //最后进球球队
+                            "match_score"=> $vv['match_score']?:0, //赛事比分
+                            "match_winer"=>  $vv['match_winer']?:'',//获胜球队
+                            "match_process"=> $vv['match_process']?:'',//比赛进程
+                            "u_home_score"=> $vv['u_home_score']?:0,//上半场主队进球数
+                            "u_guest_score"=> $vv['u_guest_score']?:0,//上半场客队进球数
+                        ];                        
+                    }                   
+                }
+            }
+        }
+
+        //写入赛果
+        if(!empty($set_match_r)){
+            $ret = $model['model_result']::insert($set_match_r);
+            if($ret != true) throw new \Exception( Response::generate('',Response::ADD_MATCH_R_ERROR));
+        }
+
+        return 1;
+    }
+
     //计算滚球 赛事进行时间
     public static function secTime($sec=0){
         $min = floor($sec/60);

+ 135 - 1
app/Http/Model/StZqResult.php

@@ -18,8 +18,9 @@ class StZqResult extends Model
 
     /*
      * 写赛事结果
+     * 弃用
      */
-    public static function ZQresult($model){
+    public static function ZQresult__($model){
         //获取赛事表7天内所有赛事
         $matchData = $model['model_match']::select('id','home_team','guest_team','lg_id','status','tag','match_date','match_time')
             ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-1 day"))]])
@@ -194,6 +195,139 @@ class StZqResult extends Model
         return 1;
     }
 
+    /*
+     * 写赛事结果
+     */
+    public static function ZQresult($model){
+        //获取当天开始并且已结束的所有赛事
+        $matchData = $model['model_match']::select('id','home_team','guest_team','lg_id','status','tag','match_date','match_time')
+            ->where([['match_date','=',date('Y-m-d', time())],['status','=',2]])
+            ->get()
+            ->toArray();
+
+        //获取赛事结果表 一天内
+        $matchData_r = $model['model_result']::select('match_id')
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-1 day"))]])
+            ->get()
+            ->toarray();
+
+        if(!empty($matchData_r)){
+            //如果结果表有数据,则获取结果表没有的赛事
+            foreach ($matchData as $k => $v) {
+                foreach ($matchData_r as $kk => $vv) {
+                    if ($v['id'] == $vv['match_id']) {
+                        unset($matchData[$k]);
+                    }
+                }
+            }
+
+        }
+
+        //没有数据,无需操作
+        if(empty($matchData)) return Response::success();
+        
+        //获取赛事id 用于获取赛事对应结果比分
+        $match_ids = [];
+        foreach($matchData as $k =>$v){
+            //只获取赛事已结束的
+            if($v['status'] == 2){
+                $match_ids[] = $v['id'];
+            }
+        }
+
+        $match_ids_str = implode(",", $match_ids);
+        
+        //上半场
+        $sql_h = "select a.match_id,a.home_score,a.guest_score,a.match_time as a_time,a.match_process,a.all_goal,a.first_score,a.last_score,a.match_score,a.match_winer from st_zq_result_record a,
+        (select match_id,max(id) id from st_zq_result_record where match_process = '上半场' and match_id IN ($match_ids_str) group by match_id)b
+        where a.match_id = b.match_id and a.id = b.id ";
+
+        //全场
+        $sql_f = "select a.match_id,a.home_score,a.guest_score,a.match_time as a_time,a.match_process,a.all_goal,a.first_score,a.last_score,a.match_score,a.match_winer,a.home_rate,a.guest_rate from st_zq_result_record a,
+        (select match_id,max(id) id from st_zq_result_record where match_id IN ($match_ids_str) group by match_id)b
+        where a.match_id = b.match_id and a.id = b.id ";
+
+        //上半场最终结果
+        $match_result_h = DB::select($sql_h);
+
+        //全场最终结果
+        $match_result_f = DB::select($sql_f);
+        //拼装赛事结果数据
+        $match_result_record = [];
+        if(!empty($match_result_h) and !empty($match_result_f)){
+            foreach($match_result_h as $k=>$v){
+                foreach($match_result_f as $kk=>$vv){
+                    if($v->match_id == $vv->match_id){
+                        $match_result_record[$k] = [
+                            "match_id"=>$v->match_id,
+                            "home_score"=> $vv->home_score,
+                            "guest_score"=> $vv->guest_score,
+                            "a_time"=> $vv->a_time,
+                            "match_process"=> $vv->match_process,
+                            "all_goal"=> $vv->all_goal,
+                            "first_score"=> $vv->first_score,
+                            "last_score"=> $vv->last_score,
+                            "match_score"=> $vv->match_score,
+                            "match_winer"=> $vv->match_winer,
+                            "u_home_score"=> $v->home_score,
+                            "u_guest_score"=> $v->guest_score,
+                            "home_rate"=> $vv->home_rate,
+                            "guest_rate"=> $vv->guest_rate,
+                        ];
+                    }
+                }
+            }
+        }
+        
+
+        //组装赛果数据
+        if(!empty($match_result_record)){
+            foreach ($matchData as $k=>$v){
+                $start_time = ($v['match_date'].' '.$v['match_time']);
+                $time = time()-strtotime($v['match_time']);
+                $match_time = self::secTime($time);
+                foreach($match_result_record as $kk =>$vv){        
+                    if($v['id'] == $vv['match_id']){
+                        $set_match_r[] = [
+                            "match_id"=> $v['id'],
+                            "home_team"=>$v['home_team'],
+                            "guest_team"=>$v['guest_team'],
+                            "lg_id"=>$v['lg_id'],
+                            "status"=>$v['status'],
+                            "tag"=> $v['tag'],
+                            'match_time'=>$vv['a_time']?:0,//比赛进行时间
+                            "ctime"=>date('Y-m-d H:i:s'),
+                            "update_time"=>date('Y-m-d H:i:s'),
+                            "start_time"=>date('Y-m-d H:i:s',strtotime($start_time)),
+
+                            "home_rate"=> $vv['home_rate']?:0, //主队让球
+                            "guest_rate"=> $vv['guest_rate']?:0, //客队让球
+                            "home_score"=> $vv['home_score']?:0, //主队进球数
+                            "guest_score"=> $vv['guest_score']?:0, //客队进球数
+                            "all_goal"=> $vv['all_goal']?:0, //总进球数
+                            "first_score"=> $vv['first_score']?:'', //最先进球球队
+                            "last_score"=> $vv['last_score']?:'', //最后进球球队
+                            "match_score"=> $vv['match_score']?:0, //赛事比分
+                            "match_winer"=>  $vv['match_winer']?:'',//获胜球队
+                            "match_process"=> $vv['match_process']?:'',//比赛进程
+                            "u_home_score"=> $vv['u_home_score']?:0,//上半场主队进球数
+                            "u_guest_score"=> $vv['u_guest_score']?:0,//上半场客队进球数
+                        ];                        
+                    }                   
+                }
+            }
+        }
+
+        //写入赛果
+        if(!empty($set_match_r)){
+            $ret = $model['model_result']::insert($set_match_r);
+            if($ret != true) throw new \Exception( Response::generate('',Response::ADD_MATCH_R_ERROR));
+        }
+
+        return 1;
+    }
+
+
     //计算滚球 赛事进行时间
     public static function secTime($sec=0){
         $min = floor($sec/60);

+ 97 - 84
resources/views/admin/SystemManage/LogList.blade.php

@@ -18,103 +18,116 @@
             width: auto;
         }
     </style>
-	<script type="text/html" id="selectip">
-	  <a href="/admin/Adminlog/logipDetail?ip=@{{d.ip}}">@{{ d.ip}}</a>
-	</script>
+    <script type="text/html" id="selectip">
+        <a href="/admin/Adminlog/logipDetail?ip=@{{d.ip}}">@{{ d.ip}}</a>
+    </script>
 
-  <script type="text/html" id="desc">
-   <span style="width: 100%;word-wrap: break-word;">@{{ d.operation}}</span>
-  </script>
+    <script type="text/html" id="desc">
+        <span style="width: 100%;word-wrap: break-word;">@{{ d.operation}}</span>
+    </script>
 
-<div class="layui-row">
+    <div class="layui-row">
 
-    <div class="layui-col-xs12">
+        <div class="layui-col-xs12">
 
-		<form class="layui-form rewrite" eventType="eventForm"  action="">
-            <div class="layui-form-item">
-                <div class="layui-inline">
-					<label class="layui-form-label">{{ trans('system_user.loginname') }}</label>
-					<div class="layui-input-inline">
-						<input type="text" name="loginname" id="loginname" lay-verify="required" eventType="event-query"  value="{{ $loginname }}" autocomplete="off" class="layui-input">
-					</div>
-					<div class="layui-input-inline checkbox">
-						<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>
-					</div>
-                </div>
-                <div class="layui-inline">
-					<label class="layui-form-label">{{ trans('system_user.ip') }}</label>
-					<div class="layui-input-inline">
-						<input type="text" name="ip"  id="ip"  lay-verify="" eventType="event-query"  value="{{ $ip }}" autocomplete="off" class="layui-input">
-					</div>
-                </div>
-                <div class="layui-inline">
-					<label class="layui-form-label">{{ trans('system_user.operation') }}</label>
-					<div class="layui-input-inline">
-						<input type="text" name="operation"  id="operation" eventType="event-query"  value="{{ $operation }}" lay-verify="" autocomplete="off" class="layui-input">
-					</div>
-                </div>
-				<div class="layui-inline">
-					<label class="layui-form-label">{{ trans('system_user.star_time') }}</label>
-					<div class="layui-input-inline">
-						<input type="text" name="star_time" value="{{ $star_time }}" id="star_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
-					</div>
-                </div>
-                <div class="layui-inline">
-					<label class="layui-form-label">{{ trans('system_user.end_time') }}</label>
-					<div class="layui-input-inline">
-						<input type="text" name="end_time"  value="{{$end_time}}" id="end_time" placeholder=" - " word-break: break-all; lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
-					</div>
-               </div>
+            <form class="layui-form rewrite" eventType="eventForm" action="">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('system_user.loginname') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="loginname" id="loginname" lay-verify="required"
+                                   eventType="event-query" value="{{ $loginname }}" autocomplete="off"
+                                   class="layui-input">
+                        </div>
+                        <div class="layui-input-inline checkbox">
+                            <input type="checkbox" name="sureblur" id="sureblur" eventType="event-query"
+                                   value="{{$sureblur}}"
+                                   lay-skin="switch" lay-text="精确|模糊" @if ($sureblur=='精确') checked @endif>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('system_user.ip') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="ip" id="ip" lay-verify="" eventType="event-query" value="{{ $ip }}"
+                                   autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('system_user.operation') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="operation" id="operation" eventType="event-query"
+                                   value="{{ $operation }}" lay-verify="" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('system_user.star_time') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="star_time" value="{{ $star_time }}" id="star_time"
+                                   placeholder=" - " lay-verify="" autocomplete="off" class="layui-input test-item"
+                                   eventType=event-query>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('system_user.end_time') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="end_time" value="{{$end_time}}" id="end_time" placeholder=" - "
+                                   word-break: break-all; lay-verify="" autocomplete="off" class="layui-input test-item"
+                                   eventType=event-query>
+                        </div>
+                    </div>
 
-                <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">ဂ</i></!-->
-                <a class="layui-btn layui-btn-sm layui-btn-green " href="javascript:window.location.reload()" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                    <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">ဂ</i></!-->
+                        <a class="layui-btn layui-btn-sm layui-btn-green " href="javascript:window.location.reload()"
+                           data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
 
-               </div>
+                    </div>
 
-            </div>
-       </form>
-    </div>
+                </div>
+            </form>
+        </div>
     </div>
-@push('dataTableJS')
-/*var active = {
-    reload: function(){
-      //执行重载
-      table.reload('{{ $dataId }}', {
+    @push('dataTableJS')
+        /*var active = {
+        reload: function(){
+        //执行重载
+        table.reload('{{ $dataId }}', {
         page: {
-          curr: 1 //重新从第 1 页开始
+        curr: 1 //重新从第 1 页开始
         }
         ,where: {
-            loginname:$("#loginname").val(),
-            ip:$('#ip').val(),
-            operation:$('#operation').val(),
-            star_time:$('#star_time').val(),
-            end_time:$('#end_time').val(),
-			sureblur:$('.layui-form-switch').text(),
+        loginname:$("#loginname").val(),
+        ip:$('#ip').val(),
+        operation:$('#operation').val(),
+        star_time:$('#star_time').val(),
+        end_time:$('#end_time').val(),
+        sureblur:$('.layui-form-switch').text(),
+        }
+        });
         }
-      });
-    }
-  };
-$('.lay-btn-diy').on('click', function(){
-    var type = $(this).data('type');
-    active[type] ? active[type].call(this) : '';
-  });*/
+        };
+        $('.lay-btn-diy').on('click', function(){
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+        });*/
 
-  //重置表单
-  $('.reset').on('click',function(){
-	  $('input').val('');
-//	  var type = $(this).data('type');
-//	  active[type] ? active[type].call(this) : '';
-  });
+        //重置表单
+        $('.reset').on('click',function(){
+        $('input').val('');
+        //      var type = $(this).data('type');
+        //      active[type] ? active[type].call(this) : '';
+        });
 
-//刷新表单
-//    $('.set').on('click',function(){
-//    var type = $(this).data('type');
-//    active[type] ? active[type].call(this) : '';
-//    });
-@endpush
+        //刷新表单
+        //    $('.set').on('click',function(){
+        //    var type = $(this).data('type');
+        //    active[type] ? active[type].call(this) : '';
+        //    });
+    @endpush
 
-@include('vip.datatable')
+    @include('vip.datatable')
 @endsection

+ 3 - 4
resources/views/admin/sportsfoot/outcome.blade.php

@@ -166,7 +166,7 @@
                 success: function(data) {
                     var  conttxt ='<div style="margin-left:100px;margin-top:20px;font-size:18px;line-height:150%;"><input type="hidden" id="matchid" name="matchid" value="'+match_id+'" /><div style="display: flex;"><li>主队全场角球:</li><input type="text" id="homeallcorner" name="homeallcorner" value="'+data.corner_ball.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场角球:</li><input type="text" id="guestallcorner" name="guestallcorner" value="'+data.corner_ball.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场角球:</li><input type="text" id="homehalfcorner" name="homehalfcorner" value="'+data.corner_ball.home_half+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场角球:</li><input type="text" id="guesthalfcorner" name="guesthalfcorner" value="'+data.corner_ball.guest_half+'" autocomplete="off"></div><div style="display: flex;"><li>主队全场罚牌:</li><input type="text" id="homeallcard" name="homeallcard" value="'+data.penalty_card.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场罚牌:</li><input type="text" id="guestallcard" name="guestallcard" value="'+data.penalty_card.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场罚牌:</li><input type="text" id="homehalfcard" name="homehalfcard" value="'+data.penalty_card.home_half+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场罚牌:</li><input type="text" id="guesthalfcard" name="guesthalfcard" value="'+data.penalty_card.guest_half+'" autocomplete="off"></div>';
                     if (data.newapp.home_score!=0 || data.newapp.guest_score!=0){
-                        conttxt += '<div style="display: flex;"><li>最先进球球队:</li><select name="firstscore" id="firstscore">';
+                        conttxt += '<div style="display: flex;"><li>首 进 球 时 间:</li><input type="text" id="onescoretime" name="onescoretime" value="'+data.first_score.scoretime+'" autocomplete="off"></div><div style="display: flex;"><li>最终获胜球队:</li><input type="text" id="matchwiner" name="matchwiner" value="'+data.newapp.match_winer+'" autocomplete="off"></div><div style="display: flex;"><li>最先进球球队:</li><select name="firstscore" id="firstscore">';
                         if(data.first_score.teamscore!=0){
                             conttxt += '<option value="'+ data.first_score.teamscore +'" selected="">'+data.first_score.teamscore+'</option><option value="">无最先进球</option>';
                         }else{
@@ -188,10 +188,10 @@
                         }else{
                             conttxt += '<option value="">请选择最后进球</option>';
                         }
-                        conttxt += '<option value="'+ data.newapp.home_team +'">'+data.newapp.home_team+'</option><option value="'+ data.newapp.guest_team +'">'+data.newapp.guest_team+'</option></select></div><div style="display: flex;"><li>首 进 球 时 间:</li><input type="text" id="onescoretime" name="onescoretime" value="'+data.first_score.scoretime+'" autocomplete="off"></div><div style="display: flex;"><li>最终获胜球队:</li><input type="text" id="matchwiner" name="matchwiner" value="'+data.newapp.match_winer+'" autocomplete="off"></div><br>';
+                        conttxt += '<option value="'+ data.newapp.home_team +'">'+data.newapp.home_team+'</option><option value="'+ data.newapp.guest_team +'">'+data.newapp.guest_team+'</option></select></div>';
 
                     }
-                    conttxt += '<div style="margin-left:230px;"><button class="layui-btn layui-btn-sm layui-btn-green set" onclick="buttonClick()"><h3>确定</h3></button>&nbsp;<button class="layui-btn layui-btn-sm layui-btn-danger"><h3>取消</h3></button></div></div>';
+                    conttxt += '<br><div style="margin-left:230px;"><button class="layui-btn layui-btn-sm layui-btn-green set" onclick="buttonClick()"><h3>确定</h3></button>&nbsp;<button class="layui-btn layui-btn-sm layui-btn-danger"><h3>取消</h3></button></div></div>';
                 
                 layer.open({
                   type: 1 //Page层类型
@@ -390,4 +390,3 @@ $('.lay-btn-diy').on('click', function(){
 
     @include('vip.datatable')
 @endsection
-