Merge branch 'today' into dev

app/Http/Controllers/admin/RechargeChannel.php

@@ -14,7 +14,8 @@ class RechargeChannel extends Controller
     //获取充值方式
     public function getChannel()
     {
-        $channel = RechargeChannelModel::getChannel(1);
+        $data_type = request()->input('data_type', 1);
+        $channel = RechargeChannelModel::getChannel($data_type);
         return $this->success(['total' => count($channel), 'data' => $channel]);
     }
 

app/Http/Controllers/admin/Sport.php

@@ -216,6 +216,9 @@ class Sport extends Controller
             $info['game_time'] = date('Y-m-d H:i:s', $info['game_time']);
             $info['rbt'] = date('Y-m-d H:i:s', $info['rbt']);
             $info['fixture_status'] = json_decode($info['fixture_status'], true);
+            if (!empty($info['fixture_status']['long'])) {
+                $info['fixture_status']['long'] = lang($info['fixture_status']['long']);
+            }
             $info['odds'] = $info['odds'] ? json_decode($info['odds'], true) : null;
             $info['odds'] = $info['odds'] ? SportModel::doOdds($info['odds'], $info['odd_values_locked']) : null;
             $info['event'] = SportEvent::where('data_id', $info['data_id'])->get();