修正后台接口

manage-server/app/Http/Controllers/ClassifyController.php

@@ -291,4 +291,47 @@ class ClassifyController extends Controller
             ]);
         }
     }
+
+
+    /**
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function store(Request $request)
+    {
+        $id = $request->input('id');
+        $pid = $request->input('pid');
+        $name = $request->input('name');
+        $info = $request->input('info');
+        $summary = $request->input('summary');
+        $server = $request->input('server');
+        $content = $request->input('content');
+        $photo = $request->input('photo');
+        $location = $request->input('location');
+        if ($id) {
+            $classify = Classify::find($id);
+        } else {
+            $classify = new Classify;
+        }
+        if ($pid && $name && $info && $summary && $server && $content && $photo && $location) {
+            $classify->pid = $pid;
+            $classify->name = $name;
+            $classify->info = $info;
+            $classify->summary = $summary;
+            $classify->server = $server;
+            $classify->content = $content;
+            $classify->photo = $photo;
+            $classify->location = $location;
+            $classify->save();
+            return Response()->json([
+                "status" => 0,
+                "message" => "保存成功!"
+            ]);
+        } else {
+            return Response()->json([
+                "status" => -1,
+                "message" => "信息不能为空!"
+            ]);
+        }
+    }
 }

manage-server/app/Http/Controllers/CommonController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\Campaign;
+use App\Models\Classify;
 use App\Models\CompanyInfo;
 use App\Models\HouseApplianceCleanOrder;
 use App\Models\HouseCleanOrder;
@@ -376,6 +377,9 @@ class CommonController extends Controller
             case "company_info":
                 $record = CompanyInfo::find($id);
                 break;
+            case "classify":
+                $record = Classify::find($id);
+                break;
             default:
                 return null;
         }

manage-server/app/Http/Controllers/HousekeeperOrderController.php

@@ -42,22 +42,13 @@ class HousekeeperOrderController extends Controller
         $notes = $request->input('notes');
         $status = $request->input('status');
         $price = $request->input('price');
-        //$photo = $request->input('photo');
+        $photo = $request->input('photo');
+        $classify = $request->input('classify');
         if ($id) {
             $housekeeperOrder = HousekeeperOrder::find($id);
             $housekeeperOrder->status = $status;
             $housekeeperOrder->price = $price;
 
-            $classify = $request->input('classify');
-            if($classify) {
-                $classify1 = $this->classify_map[$classify]->name;
-                $pid = $this->classify_map[$classify]->pid;
-                $classify2 = $this->classify_map[$pid]->name;
-                $housekeeperOrder->classify1 = $classify1;
-                $housekeeperOrder->classify2 = $classify2;
-                $housekeeperOrder->classify = $classify;
-            }
-
         } else {
             $housekeeperOrder = new HousekeeperOrder;
             $housekeeperOrder->status = 0;
@@ -73,9 +64,16 @@ class HousekeeperOrderController extends Controller
             $housekeeperOrder->contact = $contact;
             $housekeeperOrder->notes = $notes;
             $housekeeperOrder->phone = $phone;
-            $housekeeperOrder->classify = $classify;
+            if($classify) {
+                $classify1 = $this->classify_map[$classify]->name;
+                $pid = $this->classify_map[$classify]->pid;
+                $classify2 = $this->classify_map[$pid]->name;
+                $housekeeperOrder->classify1 = $classify1;
+                $housekeeperOrder->classify2 = $classify2;
+                $housekeeperOrder->classify = $classify;
+            }
             $housekeeperOrder->wechat_id = $wechat_id;
-            $housekeeperOrder->photo = "https://wechat.sotype.com/storage/gOtuHM3GvKva6x68N340DJuN6cX1oIfaAhWi8yoq.jpeg";
+            $housekeeperOrder->photo = $photo;
             $housekeeperOrder->save();
             return Response()->json([
                 "status" => 0,
@@ -97,6 +95,10 @@ class HousekeeperOrderController extends Controller
      */
     public function list(Request $request)
     {
+        $classify = $request->input("classify");
+        if($classify) {
+            return HousekeeperOrder::where("classify", $classify)->paginate(20);
+        }
         return HousekeeperOrder::paginate(20);
     }
 

manage-server/app/Http/Controllers/MaternityMatronOrderController.php

@@ -55,7 +55,7 @@ class MaternityMatronOrderController extends Controller
             $maternityMatronOrder->contact = $contact;
             $maternityMatronOrder->phone = $phone;
             $maternityMatronOrder->wechat_id = $wechat_id;
-            $maternityMatronOrder->photo = "https://wechat.sotype.com/storage/gOtuHM3GvKva6x68N340DJuN6cX1oIfaAhWi8yoq.jpeg";
+            $maternityMatronOrder->photo = $photo;
             $maternityMatronOrder->save();
             return Response()->json([
                 "status" => 0,

manage-server/app/Http/Controllers/UserController.php

@@ -50,6 +50,10 @@ class UserController extends Controller
             $token = str_replace("Bearer ", "", $token);
             if ($request->session()->has($token)) {
                 $request->session()->forget($token);
+                return response()->json([
+                    "status" => 0,
+                    "message" => "登出成功"
+                ]);
             }
         }
     }

manage-server/routes/web.php

@@ -20,7 +20,7 @@ Route::get('/', function () {
 
 
 Route::post('/upload', 'CommonController@upload');
-Route::post('/server/store', 'ServerInfoController@store');
+Route::get('/classify/{id}', 'ClassifyController@get');
 Route::get('/{order_type}/{order_id}/comments', 'CommonController@comments');
 Route::post('/{order_type}/status', 'CommonController@status');
 Route::get('/{order_type}/{id}', 'CommonController@get')->where('id', '[0-9]+');
@@ -47,6 +47,7 @@ Route::get('/classifies', 'ClassifyController@list');
 Route::post('/{order_type}/{order_id}/comment', 'CommonController@addComment');
 Route::post('/campaign/store', 'CampaignController@store');
 Route::post('/product/store', 'ProductController@store');
+Route::post('/classify/store', 'ClassifyController@store');
 Route::post('/house_clean_order/store', 'HouseCleanOrderController@store');
 Route::post('/house_appliance_clean_order/store', 'HouseApplianceCleanOrderController@store');
 Route::post('/housekeeper_order/store', 'HousekeeperOrderController@store');