diff --git a/app/applet/controller/DraftsDataController.php b/app/applet/controller/DraftsDataController.php index bfe8e64..66cbbaa 100644 --- a/app/applet/controller/DraftsDataController.php +++ b/app/applet/controller/DraftsDataController.php @@ -100,6 +100,7 @@ class DraftsDataController extends BaseController public function show(Request $request, int $id, string $scene = 'show'): Response { try { + $request->setGet('id', $id); return parent::show($request, $id, $scene); } catch (\Throwable $th) { return $this->errorResponse($th->getMessage()); @@ -109,6 +110,7 @@ class DraftsDataController extends BaseController public function edit(Request $request, int $id): Response { try { + $request->setGet('id', $id); return $this->getService()->edit($request->all(), $id) ? $this->successResponse() : $this->errorResponse(); diff --git a/app/applet/controller/VehicleDataController.php b/app/applet/controller/VehicleDataController.php index 16178d2..bbab0f8 100644 --- a/app/applet/controller/VehicleDataController.php +++ b/app/applet/controller/VehicleDataController.php @@ -143,6 +143,7 @@ class VehicleDataController extends BaseController if ($scene === 'default') { $params['filters'] = []; $params['filters'][] = ['field' => 'info_status', 'operator' => '=', 'value' => 1]; + $params['filters'][] = ['field' => 'user_id', 'operator' => '=', 'value' => $request->user->user_id]; // 是否热门 if (isset($params['is_hot']) && $params['is_hot']) { $params['page'] = 1; diff --git a/app/applet/service/DraftsDataService.php b/app/applet/service/DraftsDataService.php index ce0eb78..d42947b 100644 --- a/app/applet/service/DraftsDataService.php +++ b/app/applet/service/DraftsDataService.php @@ -58,6 +58,48 @@ class DraftsDataService extends BaseService // ] // ]; // } + 'show' => function(array $params) { + return [ + 'filters' => [ + ['field'=>'id', 'operator'=>'=', 'value'=> $params['id']], + ], + 'fields' => [ + 'id','vin','price','cover', + 'type','energy','model','mileage','vehicle_age', + 'views','is_hot','created_at','updated_at', 'brand', 'model', 'user_id', 'store_status', 'location' + ], + 'relations' => [ + 'translation' => ['vehicle_id', 'name','condition_desc'], + 'brand.translation' => ['brand_id', 'name'], + 'album' => [ + 'id', 'vehicle_data_id', 'front_45_degree', + 'front_left_45_degree', 'front_left_headlight', + 'front_view', 'lower_front', 'wheel_hub', + 'front_right_seat', 'right_lower_side', + 'rear_right_taillight', 'rear_right_45_degree', + 'lower_rear', 'trunk', 'left_lower_side', + 'rear_seats', 'center_console', 'control_panel', + 'gear_shift', 'car_key', 'steering_wheel', + 'dashboard', 'odometer_reading', + 'front_left_door_panel', 'front_left_door_function_area', + 'front_left_seat', 'interior_ceiling' + ], + 'user' => ['realname', 'nickname'], + 'types.translation' => ['type_id', 'name'], + 'energy.translation' => ['energy_id', 'name'], + 'models.translation' => ['model_id', 'name'], + 'user' => ['nickname'], + 'location.translation' => ['location_id', 'name'] + ], + 'sorts' => [ + ['field'=>'id','direction'=>'desc'], + ], + 'pagination' => [ + 'page' => $params['page'] ?? 1, + 'per_page' => $params['per_page'] ?? 10, + ], + ]; + }, ]; } diff --git a/config/route.php b/config/route.php index 5e291c6..c88c564 100644 --- a/config/route.php +++ b/config/route.php @@ -93,9 +93,9 @@ Route::group('/applet', function() { // // 草稿 - 添加 Route::post('draft/add', [\app\applet\controller\DraftsDataController::class, 'add']); // // 草稿 - 更新 - Route::post('draft/update/{draftId}', [\app\applet\controller\DraftsDataController::class, 'edit']); + Route::post('draft/update/{id}', [\app\applet\controller\DraftsDataController::class, 'edit']); // // 草稿 - 详情 - Route::get('draft/detail/{draftId}', [\app\applet\controller\DraftsDataController::class, 'show']); + Route::get('draft/detail/{id}', [\app\applet\controller\DraftsDataController::class, 'show']); // // 草稿 - 列表 // Route::get('draft/list', [\app\applet\controller\DraftsController::class, 'pageLists']); // // 草稿 - 删除