将server_info get功能迁移到classify里面，修复混淆问题

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

@@ -7,8 +7,219 @@ use App\Models\Classify;
 
 class ClassifyController extends Controller
 {
+
     public function list(Request $request)
     {
         return Classify::paginate(100);
     }
+
+
+    /**
+     * 获取某个记录
+     * @param Request $request
+     * @param $id
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function get(Request $request,  $id)
+    {
+        $id = $request->route("id");
+        $fields_josn = "";
+        if($id == 6) {
+            $fields_josn ='{
+                "id": 6,
+                "api": "/api/maternity_matron_order/store",
+                "fields": [
+                    {
+                        "name": "level",
+                        "name_cn": "一价全包",
+                        "input_group": [
+                            {
+                                "type": "radio",
+                                "value": "8800（初级月嫂）"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "9800（普通月嫂）"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "12800（高级月嫂）"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "15800（金牌月嫂）"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "18800（特级月嫂）"
+                            }
+                        ]
+                    }
+                ]
+            }';
+        } else {
+            $fields_josn = '{
+                "id": 7,
+                "api": "/api/housekeeper_order/store",
+                "fields": [
+                    {
+                        "name": "contents",
+                        "name_cn": "服务内容",
+                        "input_group": [
+                            {
+                                "type": "radio",
+                                "value": "保洁"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "婴儿看护"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "老人看护"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "全护理老人"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "空调清洗"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "冰箱清洗"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "抽油烟机清洗"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "家庭除螨"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "开荒清洁"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "催乳"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "产后康复"
+                            }
+                        ]
+                    },
+                    {
+                        "name": "people_num",
+                        "name_cn": "人口数量",
+                        "input_group": [
+                            {
+                                "type": "radio",
+                                "value": "1-2人"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "3-4人"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "5-6人"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "6人以上"
+                            }
+                        ]
+                    },
+                    {
+                        "name": "area",
+                        "name_cn": "房屋面积",
+                        "input_group": [
+                            {
+                                "type": "radio",
+                                "value": "60平以下"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "60-120平"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "120-160平"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "160-200平"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "200平以上"
+                            }
+                        ]
+                    },
+                    {
+                        "name": "server_time",
+                        "name_cn": "服务时间",
+                        "input_group": [
+                            {
+                                "type": "radio",
+                                "value": "全白天"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "住家"
+                            }
+                        ]
+                    },
+                    {
+                        "name": "rest",
+                        "name_cn": "休息安排",
+                        "input_group": [
+                            {
+                                "type": "radio",
+                                "value": "每周单休"
+                            },   
+                            {
+                                "type": "radio",
+                                "value": "每周双休"
+                            }
+                        ]
+                    }
+                ]
+            }';
+        }
+
+        $data = json_decode($fields_josn, true);
+        $data["id"] = $id;
+        if ($id) {
+            $record = Classify::find($id);
+            if ($record) {
+
+                return Response()->json([
+                    "status" => 0,
+                    "data" => [
+                        "id" => $record->id,
+                        "pid" => $record->pid,
+                        "name" => $record->name,
+                        "info" => $record->info,
+                        "content" => $record->content,
+                        "api" => $data["api"],
+                        "fields" => $data["fields"]
+                    ]
+                ]);
+            }
+            return Response()->json([
+                "status" => -2,
+                "message" => "不存在的记录！"
+            ]);
+        } else {
+            return Response()->json([
+                "status" => -1,
+                "message" => "id不能为空!"
+            ]);
+        }
+    }
 }

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

@@ -382,11 +382,5 @@ class CommonController extends Controller
         return $record;
     }
 
-    public function server_json(Request $request) {
-        $disk = Storage::disk('local');
-        $json_string = $disk->get("server.json");
-        // 用参数true把JSON字符串强制转成PHP数组  
-        $data = json_decode($json_string, true);  
-        return Response()->json($data);
-    }
+
 }

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

@@ -44,215 +44,6 @@ class ServerInfoController extends Controller
         }
     }
 
-    /**
-     * 获取某个记录
-     * @param Request $request
-     * @param $id
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function get(Request $request,  $id)
-    {
-        $id = $request->route("id");
-        $fields_josn = "";
-        if($id == 6) {
-            $fields_josn ='{
-                "id": 6,
-                "api": "/api/maternity_matron_order/store",
-                "fields": [
-                    {
-                        "name": "level",
-                        "name_cn": "一价全包",
-                        "input_group": [
-                            {
-                                "type": "radio",
-                                "value": "8800（初级月嫂）"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "9800（普通月嫂）"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "12800（高级月嫂）"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "15800（金牌月嫂）"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "18800（特级月嫂）"
-                            }
-                        ]
-                    }
-                ]
-            }';
-        } else {
-            $fields_josn = '{
-                "id": 7,
-                "api": "/api/housekeeper_order/store",
-                "fields": [
-                    {
-                        "name": "contents",
-                        "name_cn": "服务内容",
-                        "input_group": [
-                            {
-                                "type": "radio",
-                                "value": "保洁"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "婴儿看护"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "老人看护"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "全护理老人"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "空调清洗"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "冰箱清洗"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "抽油烟机清洗"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "家庭除螨"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "开荒清洁"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "催乳"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "产后康复"
-                            }
-                        ]
-                    },
-                    {
-                        "name": "people_num",
-                        "name_cn": "人口数量",
-                        "input_group": [
-                            {
-                                "type": "radio",
-                                "value": "1-2人"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "3-4人"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "5-6人"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "6人以上"
-                            }
-                        ]
-                    },
-                    {
-                        "name": "area",
-                        "name_cn": "房屋面积",
-                        "input_group": [
-                            {
-                                "type": "radio",
-                                "value": "60平以下"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "60-120平"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "120-160平"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "160-200平"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "200平以上"
-                            }
-                        ]
-                    },
-                    {
-                        "name": "server_time",
-                        "name_cn": "服务时间",
-                        "input_group": [
-                            {
-                                "type": "radio",
-                                "value": "全白天"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "住家"
-                            }
-                        ]
-                    },
-                    {
-                        "name": "rest",
-                        "name_cn": "休息安排",
-                        "input_group": [
-                            {
-                                "type": "radio",
-                                "value": "每周单休"
-                            },   
-                            {
-                                "type": "radio",
-                                "value": "每周双休"
-                            }
-                        ]
-                    }
-                ]
-            }';
-        }
-
-        $data = json_decode($fields_josn, true);  
-        $data["id"] = $id;
-        if ($id) {
-            $record = ServerInfo::find($id);
-            if ($record) {
-
-                return Response()->json([
-                    "status" => 0,
-                    "data" => [
-                        "id" => $record->id,
-                        "server" => $record->server,
-                        "content" => $record->content,
-                        "photo" => $record->photo,
-                        "location" => $record->location,
-                        "api" => $data["api"],
-                        "fields" => $data["fields"]
-                    ]
-                ]);
-            }
-            return Response()->json([
-                "status" => -2,
-                "message" => "不存在的记录！"
-            ]);
-        } else {
-            return Response()->json([
-                "status" => -1,
-                "message" => "id不能为空!"
-            ]);
-        }
-    }
-
     /**
      * 每页20进行分页
      * @param Request $request

manage-server/app/Models/Classify.php

@@ -10,6 +10,7 @@ class Classify extends Model
         'pid', // 父id
         'name', // 名称
         'info', // 描述信息
+        'content', // 富文本介绍
     ];
 
     protected $children = [];

manage-server/database/migrations/2018_08_20_075456_create_classifies_table.php

@@ -19,6 +19,7 @@ class CreateClassifiesTable extends Migration
             $table->unsignedInteger('pid');
             $table->string('name');
             $table->string('info');
+            $table->text('content');
         });
     }
 

manage-server/routes/api.php

@@ -20,7 +20,7 @@ Route::middleware('auth:api')->get('/user', function (Request $request) {
 
 Route::post('/login', 'CommonController@login');
 
-Route::get('/server_info/{id}', 'ServerInfoController@get');
+Route::get('/classify/{id}', 'ClassifyController@get');
 Route::post('/upload', 'CommonController@upload');
 Route::post('/server/store', 'ServerInfoController@store');
 Route::get('/{order_type}/{order_id}/comments', 'CommonController@comments');
@@ -40,7 +40,6 @@ Route::get('/housekeeper_orders', 'HousekeeperOrderController@list');
 Route::get('/maternity_matron_orders', 'MaternityMatronOrderController@list');
 Route::get('/product_orders', 'ProductOrderController@list');
 Route::get('/server_infos', 'ServerInfoController@list');
-Route::get('/server_info/{id}', 'ServerInfoController@get');
 Route::get('/server_fields', 'CommonController@server_json');
 Route::get('/classifies', 'ClassifyController@list');
 Route::get('/company_info', 'CompanyInfoController@info');