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

app/Http/Model/StBqResult.php

@@ -43,7 +43,7 @@ class StBqResult extends Model
                     "status"=>$v['status'],
                     "tag"=> $v['tag'],
                     'match_time'=>$match_time,
-                    "update_time"=>date('Y-m-d H:m:i')
+                    "ctime"=>date('Y-m-d H:m:i')
                 ];
             }
             $ret = $model['model_result']::insert($set_match_r);
@@ -72,7 +72,7 @@ class StBqResult extends Model
                     "status"=>$v['status'],
                     "tag"=> $v['tag'],
                     'match_time'=>$match_time,
-                    "update_time"=>date('Y-m-d H:m:i')
+                    "ctime"=>date('Y-m-d H:m:i')
                 ];
             }
             $ret = $model['model_result']::insert($set_match_r);

app/Http/Model/StLqResult.php

@@ -50,7 +50,7 @@ class StLqResult extends Model
                     "tag"=> $v['tag'],
                     "match_process"=>$process,
                     'match_time'=>12,
-                    "update_time"=>date('Y-m-d H:m:i')
+                    "ctime"=>date('Y-m-d H:m:i')
                 ];
             }
             $ret = $model['model_result']::insert($set_match_r);
@@ -87,7 +87,7 @@ class StLqResult extends Model
                         "tag"=> $v['tag'],
                         "match_process"=>$process,
                         'match_time'=>12,
-                        "update_time"=>date('Y-m-d H:m:i')
+                        "ctime"=>date('Y-m-d H:m:i')
                     ];
                 }
                 $ret = $model['model_result']::insert($set_match_r);

app/Http/Model/StWqResult.php

@@ -17,7 +17,7 @@ class StWqResult extends Model
     //写赛事结果
     public static function WQresult($model){
         //获取赛事表15天内所有非 未开始赛事
-        $matchData = $model['model_match']::select('id','home_team','guest_team','lg_id','status','tag','match_time')
+        $matchData = $model['model_match']::select('id','home_player_name','guest_player_name','lg_id','status','tag','match_time')
             ->where([['ctime','>',date('Y-m-d H:m:i', strtotime("-7 day"))]])
             ->get()
             ->toarray();
@@ -37,13 +37,13 @@ class StWqResult extends Model
                 $match_time = self::secTime($time);
                 $set_match_r[] = [
                     "match_id"=> $v['id'],
-                    "home_team"=>$v['home_team'],
-                    "guest_team"=>$v['guest_team'],
+                    "home_player_name"=>$v['home_player_name'],
+                    "guest_player_name"=>$v['guest_player_name'],
                     "lg_id"=>$v['lg_id'],
                     "status"=>$v['status'],
                     "tag"=> $v['tag'],
                     'match_time'=>$match_time,
-                    "update_time"=>date('Y-m-d H:m:i')
+                    "ctime"=>date('Y-m-d H:m:i')
                 ];
             }
             $ret = $model['model_result']::insert($set_match_r);
@@ -66,13 +66,13 @@ class StWqResult extends Model
                 $match_time = self::secTime($time);
                 $set_match_r[] = [
                     "match_id"=> $v['id'],
-                    "home_team"=>$v['home_team'],
-                    "guest_team"=>$v['guest_team'],
+                    "home_player_name"=>$v['home_player_name'],
+                    "guest_player_name"=>$v['guest_player_name'],
                     "lg_id"=>$v['lg_id'],
                     "status"=>$v['status'],
                     "tag"=> $v['tag'],
                     'match_time'=>$match_time,
-                    "update_time"=>date('Y-m-d H:m:i')
+                    "ctime"=>date('Y-m-d H:m:i')
                 ];
             }
             $ret = $model['model_result']::insert($set_match_r);

app/Http/Model/StZqResult.php

@@ -42,7 +42,7 @@ class StZqResult extends Model
                     "status"=>$v['status'],
                     "tag"=> $v['tag'],
                     'match_time'=>$match_time,
-                    "update_time"=>date('Y-m-d H:m:i')
+                    "ctime"=>date('Y-m-d H:m:i')
                 ];
             }
             $ret = $model['model_result']::insert($set_match_r);
@@ -71,7 +71,7 @@ class StZqResult extends Model
                     "status"=>$v['status'],
                     "tag"=> $v['tag'],
                     'match_time'=>$match_time,
-                    "update_time"=>date('Y-m-d H:m:i')
+                    "ctime"=>date('Y-m-d H:m:i')
                 ];
             }
             $ret = $model['model_result']::insert($set_match_r);

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

@@ -3,27 +3,7 @@
     足球赛事
 @endsection
 @section('content')
-    <style>
-        .layui-laydate-range {
-            width: auto;
-        }
-
-        .layui-form-switch em {
-            width: auto;
-        }
-
-        .layui-form-switch {
-            width: 44px;
-            line-height: 23px;
-        }
-
-        .layui-form-item .checkbox {
-            width: auto;
-        }
-    </style>
-	
-	 <!-- 样式 -->
-	<style type="text/css">
+<style type="text/css">
     /* 弹窗 (background) */
     .modal {
         display: none; /* 默认隐藏 */
@@ -52,7 +32,7 @@
         background-color: #fefefe;
         margin: auto;
         padding: 260px auto;
-        width: 500px;
+        width: 600px;
         box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19);
         -webkit-animation-name: animatetop;
         -webkit-animation-duration: 0.4s;
@@ -106,7 +86,7 @@
         display: flex;
         justify-content: space-around;
         align-items: center;
-        width: 420px;
+        width: 520px;
         padding: 0 40px;
         height: 50px;
        border-radius:0 0 5px 5px;
@@ -281,7 +261,7 @@
                     <h2>赛事结果添加</h2>
                 </div>
                 <div class="modal-body">
-                    <p style="text-align:left;">请认真填写赛事结果,将会按照改结果结算</p><br>
+                    <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="">
@@ -321,7 +301,7 @@
                         </div>
                         <div style="display: flex;">
                             <li>客队半场罚牌：</li><input type="text" id="guesthalfcorner" name="guesthalfcorner" value="" autocomplete="off">
-                        </div>
+                        </div><br>
                     </div>
                 </div>
                 <div class="modal-footer">