Merge branch 'master' of 47.101.48.251:/data/git/bd-fangke

app/Http/Controllers/Admin/VisitController.php

@@ -39,7 +39,7 @@ class VisitController extends CommonController
     public function index()
     {
         $all = request()->all();
-        $list = Visit::with('visitTime')->where(function ($query) use ($all) {
+        $list = Visit::with('visitTime', 'admin')->where(function ($query) use ($all) {
             if (isset($all['keyword'])) {
                 $query->where('name', 'like', '%' . $all['keyword'] . '%');
             }
@@ -164,7 +164,7 @@ class VisitController extends CommonController
                 $model = new Visit();
                 $all['admin_id'] = $this->getUserId();
                 $all['department_id'] = $this->getUser()->department_id;
-                $all['code'] = randStr(6,true);
+                $all['code'] = randStr(6, true);
             }
             $model->fill($all);
             $model->save();

app/Http/Controllers/Mobile/VisitController.php

@@ -7,6 +7,7 @@ use App\Models\Study;
 use App\Models\Visit;
 use App\Models\VisitArea;
 use App\Models\VisitAudit;
+use App\Models\VisitTime;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 
@@ -127,5 +128,51 @@ class VisitController extends CommonController
         return $this->success($detail);
     }
 
+    /**
+     * @OA\Get(
+     *     path="/api/mobile/visit/visit-area",
+     *     tags={"小程序-拜访区域"},
+     *     summary="列表",
+     *     description="",
+     *     @OA\Parameter(name="keyword", in="query", @OA\Schema(type="string"), required=false, description="关键词"),
+     *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"),
+     *     @OA\Response(
+     *      response="200",
+     *      description="暂无"
+     *     )
+     * )
+     */
+    public function visitArea()
+    {
+        $all = request()->all();
+        $list = VisitArea::where(function ($query) use ($all) {
+            if (isset($all['keyword'])) {
+                $query->where('name', 'like', '%' . $all['keyword'] . '%');
+            }
+        })->get();
+        return $this->success($list);
+    }
+
+    /**
+     * @OA\Get(
+     *     path="/api/mobile/visit/visit-time",
+     *     tags={"小程序-拜访时间段"},
+     *     summary="列表",
+     *     description="",
+     *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"),
+     *     @OA\Response(
+     *      response="200",
+     *      description="暂无"
+     *     )
+     * )
+     */
+    public function visitTime()
+    {
+        $all = request()->all();
+        $list = VisitTime::where(function ($query) use ($all) {
+
+        })->get();
+        return $this->success($list);
+    }
 
 }

routes/api.php

@@ -83,7 +83,10 @@ Route::group(["namespace" => "Mobile", "prefix" => "mobile"], function () {
     Route::get('user/show', [\App\Http\Controllers\Mobile\UserController::class, 'show']);
     Route::get('user/my-visit', [\App\Http\Controllers\Mobile\UserController::class, 'myVisit']);
     Route::get('user/my-visit-detail', [\App\Http\Controllers\Mobile\UserController::class, 'myVisitDetail']);
-    Route::post('user/visit-save', [\App\Http\Controllers\Mobile\UserController::class, 'visitSave']);
-    Route::get('user/get-ask', [\App\Http\Controllers\Mobile\UserController::class, 'getAsk']);
+
+    Route::post('visit/visit-save', [\App\Http\Controllers\Mobile\VisitController::class, 'visitSave']);
+    Route::get('visit/get-ask', [\App\Http\Controllers\Mobile\VisitController::class, 'getAsk']);
+    Route::get('visit/visit-area', [\App\Http\Controllers\Mobile\VisitController::class, 'visitArea']);
+    Route::get('visit/visit-time', [\App\Http\Controllers\Mobile\VisitController::class, 'visitTime']);
 
 });