From 86f0477c38e1c7d4ab0efc60a4c6e5064328cbaf Mon Sep 17 00:00:00 2001 From: liyinglin Date: Wed, 12 Apr 2023 10:22:18 +0800 Subject: [PATCH] 1 --- .../Controllers/Mobile/UserController.php | 24 +++++++++++++++++-- routes/api.php | 3 ++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Mobile/UserController.php b/app/Http/Controllers/Mobile/UserController.php index 31722c9..b4fc719 100644 --- a/app/Http/Controllers/Mobile/UserController.php +++ b/app/Http/Controllers/Mobile/UserController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\Mobile; use App\Helpers\ResponseCode; use App\Helpers\StarterResponseCode; +use App\Models\Config; use App\Models\User; use App\Models\Visit; use EasyWeChat\Factory; @@ -161,7 +162,7 @@ class UserController extends CommonController public function myVisit() { $all = request()->all(); - $list = Visit::with('logs.admin','logs.user', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department')->where('user_id', $this->getUserId()) + $list = Visit::with('logs.admin', 'logs.user', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department')->where('user_id', $this->getUserId()) ->where(function ($query) use ($all) { if (isset($all['type'])) { $query->where('type', $all['type']); @@ -197,8 +198,27 @@ class UserController extends CommonController if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); } - $detail = Visit::with('logs.admin','logs.user','visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department')->find($all['id']); + $detail = Visit::with('logs.admin', 'logs.user', 'visitTime', 'admin', 'visitArea', 'acceptAdmin.department', 'acceptAdminSignFile', 'acceptGoodsAdmin.department')->find($all['id']); return $this->success($detail); } + /** + * @OA\Get( + * path="/api/mobile/user/config", + * tags={"小程序-用户管理"}, + * summary="配置信息", + * description="", + * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"), + * @OA\Response( + * response="200", + * description="暂无" + * ) + * ) + */ + public function config() + { + $list = Config::get(); + return $this->success($list); + } + } diff --git a/routes/api.php b/routes/api.php index 8a37524..0a4e8e0 100644 --- a/routes/api.php +++ b/routes/api.php @@ -84,7 +84,8 @@ Route::group(["namespace" => "Admin", "prefix" => "admin", "middleware" => "sanc // 前台 Route::get('mobile/user/login', [\App\Http\Controllers\Mobile\UserController::class, 'login']); -Route::group(["namespace" => "Mobile", "prefix" => "mobile","middleware" => "sanctum.jwt:mobile"], function () { +Route::get('mobile/user/config', [\App\Http\Controllers\Mobile\UserController::class, 'config']); +Route::group(["namespace" => "Mobile", "prefix" => "mobile", "middleware" => "sanctum.jwt:mobile"], function () { Route::post('user/save', [\App\Http\Controllers\Mobile\UserController::class, 'save']); Route::get('user/mobile', [\App\Http\Controllers\Mobile\UserController::class, 'mobile']); Route::get('user/show', [\App\Http\Controllers\Mobile\UserController::class, 'show']);