This commit is contained in:
hujiabin 2024-10-17 14:50:26 +08:00
parent 25579c5597
commit 4785e2831f

View File

@ -38,17 +38,18 @@ class CircuitController extends BaseAuthedController {
$nextCircuitMeta = mt\CircuitTime::getNextCircuit(); $nextCircuitMeta = mt\CircuitTime::getNextCircuit();
$taskList = array(); $taskList = array();
if (!$circuitCircuitMeta && $nextCircuitMeta){ if (!$circuitCircuitMeta && $nextCircuitMeta){
$metas = \mt\CircuitTask::getListBySeason($nextCircuitMeta['circuit_season']); $circuitCircuitMeta = $nextCircuitMeta;
}
$metas = \mt\CircuitTask::getListBySeason($circuitCircuitMeta['circuit_season']);
if (count($metas) > 0){ if (count($metas) > 0){
foreach ($metas as $meta){ foreach ($metas as $meta){
array_push($taskList, array( array_push($taskList, array(
'task_id' => $meta['id'], 'task_id' => $meta['id'],
'current' => CircuitTask::getCurrentVal($nextCircuitMeta['circuit_season'],$meta['type']), 'current' => CircuitTask::getCurrentVal($circuitCircuitMeta['circuit_season'],$meta['type']),
'target' => $meta['target'], 'target' => $meta['target'],
)); ));
} }
} }
}
$this->_rspData(array('list' => $taskList)); $this->_rspData(array('list' => $taskList));
} }