Merge branch 'master'

app/Models/SportsNoteList.php

@@ -81,16 +81,16 @@ class SportsNoteList extends BaseModel {
             }
 
             if($data[$i]->game_code == 'zq'){
-                $data[$i]->match_id_order = '<a href="/admin/sportsfoot/outcome?match_id='.$data[$i]->match_id.'">'.$data[$i]->match_id.'</a> (<span>'.$data[$i]->account_name.'</span>)<br>'.$data[$i]->order_id;
+                $data[$i]->match_id_order = '<a href="/admin/sportsfoot/outcome?home_team='.$data[$i]->match_id.'">'.$data[$i]->match_id.'</a> (<span>'.$data[$i]->account_name.'</span>)<br>'.$data[$i]->order_id;
             }
             if($data[$i]->game_code == 'lq'){
-                $data[$i]->match_id_order = '<a href="/admin/Sportsbk/outcome?match_id='.$data[$i]->match_id.'">'.$data[$i]->match_id.'</a> (<span>'.$data[$i]->account_name.'</span>)<br>'.$data[$i]->order_id;
+                $data[$i]->match_id_order = '<a href="/admin/Sportsbk/outcome?home_team='.$data[$i]->match_id.'">'.$data[$i]->match_id.'</a> (<span>'.$data[$i]->account_name.'</span>)<br>'.$data[$i]->order_id;
             }
             if($data[$i]->game_code == 'wq'){
-                $data[$i]->match_id_order = '<a href="/admin/Sportswq/outcome?match_id='.$data[$i]->match_id.'">'.$data[$i]->match_id.'</a> (<span>'.$data[$i]->account_name.'</span>)<br>'.$data[$i]->order_id;
+                $data[$i]->match_id_order = '<a href="/admin/Sportswq/outcome?home_team='.$data[$i]->match_id.'">'.$data[$i]->match_id.'</a> (<span>'.$data[$i]->account_name.'</span>)<br>'.$data[$i]->order_id;
             }
             if($data[$i]->game_code == 'bq'){
-                $data[$i]->match_id_order = '<a href="/admin/Sportsbq/outcome?match_id='.$data[$i]->match_id.'">'.$data[$i]->match_id.'</a> (<span>'.$data[$i]->account_name.'</span>)<br>'.$data[$i]->order_id;
+                $data[$i]->match_id_order = '<a href="/admin/Sportsbq/outcome?home_team='.$data[$i]->match_id.'">'.$data[$i]->match_id.'</a> (<span>'.$data[$i]->account_name.'</span>)<br>'.$data[$i]->order_id;
             }
 
             $data[$i]->league = $data[$i]->name_chinese;
@@ -194,17 +194,17 @@ class SportsNoteList extends BaseModel {
 
             if($data[$i]->status == 1){
                 if($data[$i]->match_status == 0 || $data[$i]->match_status == 1){
-                    $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
+                    $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
                 }
                 if($data[$i]->match_status == 2 || $data[$i]->match_status == 5){
                     if($data[$i]->settle_status == '已结算'){
-                        $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
+                        $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
                     }else{
-                        $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
+                        $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
                     }
                 }
                 if($data[$i]->match_status == 3){
-                    $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
+                    $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
                 }
             }else{
                 $data[$i]->game_status = $data[$i]->game_status.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';