Merge branch 'master'

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -36,7 +36,7 @@ class SoccerNoteListController extends Controller
         $dt->setDataSource('/admin/SoccerNoteList/info');
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
-        $dt->addColsFields('match_id_order', array('templet' => '#userdetail', 'sort' => true, 'width' => 200));
+        $dt->addColsFields('match_id_order', array('sort' => true, 'width' => 200));
         $dt->addColsFields('league', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 250));

app/Models/SportsNoteList.php

@@ -80,7 +80,19 @@ class SportsNoteList extends BaseModel {
                 $data[$i]->game_status = '已处理';
             }
 
-            $data[$i]->match_id_order = '<span>'.$data[$i]->match_id.'</span> (<span>'.$data[$i]->account_name.'</span>)<br>'.$data[$i]->order_id;
+            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;
+            }
+            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;
+            }
+            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;
+            }
+            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]->league = $data[$i]->name_chinese;
 
             $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;