diff --git a/app/Http/Controllers/Admin/ParkingReservationController.php b/app/Http/Controllers/Admin/ParkingReservationController.php index e2f98fa..908af5d 100644 --- a/app/Http/Controllers/Admin/ParkingReservationController.php +++ b/app/Http/Controllers/Admin/ParkingReservationController.php @@ -119,6 +119,7 @@ class ParkingReservationController extends Controller ); $item['floor'] = AdminFloor::getName($item['floor_id']); $item['floor_region'] = AdminFloorRegion::getName($item['floor_region_id']); + $item['license_plate_type'] = $this->service->getLicensePlateTypeStr($item['getLicensePlateTypeStr']); unset( $item['space_type_id'], $item['license_plate_id'], diff --git a/app/Services/ParkingReservationService.php b/app/Services/ParkingReservationService.php index df28653..1a89793 100644 --- a/app/Services/ParkingReservationService.php +++ b/app/Services/ParkingReservationService.php @@ -12,6 +12,14 @@ class ParkingReservationService extends BaseService */ public array $statusArr = ['undetermined', 'confirmed', 'canceled']; + /** + * @var string[] + */ + public array $licensePlateTypeArr = [ + 1 => 'fuel-powered_vehicle', + 2 => 'new_energy_vehicle' + ]; + public array $isDriver = ['no', 'yes']; /** @@ -28,6 +36,20 @@ class ParkingReservationService extends BaseService return $value; } + /** + * 返回翻译后的状态 + * @param $licensePlateType + * @return string + */ + public function getLicensePlateTypeStr($licensePlateType): string + { + $value = $this->licensePlateTypeArr[$licensePlateType] ?? ''; + if ($value) { + return __('service.reservation.' . $value); + } + return $value; + } + public function getStatusArr(): array { $arr = []; diff --git a/resources/lang/en/service.php b/resources/lang/en/service.php index a754f24..a2e7611 100644 --- a/resources/lang/en/service.php +++ b/resources/lang/en/service.php @@ -40,7 +40,9 @@ return [ 'confirmed' => 'Confirmed', 'canceled' => 'Canceled', 'yes' => 'yes', - 'no' => 'No' + 'no' => 'No', + 'fuel' => 'fuel', + 'new_energy' => 'new energy' ], 'parking_space' => [ 'vacant' => 'vacant', diff --git a/resources/lang/zh-CN/service.php b/resources/lang/zh-CN/service.php index 263c6e0..641961c 100644 --- a/resources/lang/zh-CN/service.php +++ b/resources/lang/zh-CN/service.php @@ -40,7 +40,9 @@ return [ 'confirmed' => '已确定', 'canceled' => '已取消', 'yes' => '是', - 'no' => '否' + 'no' => '否', + 'fuel' => '燃油', + 'new_energy' => '新能源' ], 'parking_space' => [ 'vacant' => '空置', diff --git a/resources/lang/zh-TW/service.php b/resources/lang/zh-TW/service.php index b780d0d..6c2c303 100644 --- a/resources/lang/zh-TW/service.php +++ b/resources/lang/zh-TW/service.php @@ -40,7 +40,9 @@ return [ 'confirmed' => '已確定', 'canceled' => '已取消', 'yes' => '是', - 'no' => '否' + 'no' => '否', + 'fuel' => '燃油', + 'new_energy' => '新能源' ], 'parking_space' => [ 'vacant' => '空置',