diff --git a/app/ticket/service/TicketService.php b/app/ticket/service/TicketService.php index a1f1825..fd39be0 100644 --- a/app/ticket/service/TicketService.php +++ b/app/ticket/service/TicketService.php @@ -18,8 +18,9 @@ class TicketService { $res = (new TicketLogic())->list($params); foreach ($res as $k => &$v) { - $res[$k]['categorie']['name'] = isset($v['categorie']['translation']) ? $v['categorie']['translation']['name'] : ''; - unset($v['categorie']['translation']); + $name = isset($v['categorie']['translation']) ? $v['categorie']['translation']['name'] : ''; + $res[$k]['categorie']['name'] = $name; + unset($res[$k]['categorie']['translation']); foreach ($v['attachments'] as &$attachments) { $attachments['storage_path_full'] = (new \app\common\service\OssService())->generatePrivateUrl($attachments['storage_path']); } diff --git a/config/constants/Constants.php b/config/constants/Constants.php index e4c9284..1e77a2b 100644 --- a/config/constants/Constants.php +++ b/config/constants/Constants.php @@ -17,21 +17,21 @@ class Constants self::TICKET_STATUS['PROCESS'] => '处理中', self::TICKET_STATUS['CONFIRM'] => '待确认', self::TICKET_STATUS['FINISH'] => '已完成', - self::TICKET_STATUS['REJECTED'] => '已驳回', + self::TICKET_STATUS['REJECTED'] => '关闭', ]; public const TICKET_STATUS_EN = [ self::TICKET_STATUS['PENDING'] => 'Pending acceptance', self::TICKET_STATUS['PROCESS'] => 'Processing', self::TICKET_STATUS['CONFIRM'] => 'To be confirmed', self::TICKET_STATUS['FINISH'] => 'Completed', - self::TICKET_STATUS['REJECTED'] => 'Rejected', + self::TICKET_STATUS['REJECTED'] => 'close', ]; public const TICKET_STATUS_RU = [ self::TICKET_STATUS['PENDING'] => 'Подлежит рассмотрению', self::TICKET_STATUS['PROCESS'] => 'В процессе обработки', self::TICKET_STATUS['CONFIRM'] => 'Подлежит подтверждению', self::TICKET_STATUS['FINISH'] => 'Завершено', - self::TICKET_STATUS['REJECTED'] => 'Отклонено', + self::TICKET_STATUS['REJECTED'] => 'Закрыть', ]; } \ No newline at end of file