新增自定义字段接口

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

@@ -77,181 +77,13 @@ class ClassifyController extends Controller
     public function get(Request $request,  $id)
     {
         $id = $request->route("id");
-        $fields_josn = "";
-        if($id == 6) {
-            $fields_josn ='{
-                "id": 6,
-                "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": "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;
+        $data = [];
         if ($id) {
             $record = Classify::find($id);
             if ($record) {
-
+                $data["api"] = $record->api;
+                $data["fields"] = json_decode($record->fields_json, true);
                 return Response()->json([
                     "status" => 0,
                     "data" => [
@@ -329,10 +161,15 @@ class ClassifyController extends Controller
         $content = $request->input('content');
         $photo = $request->input('photo');
         $location = $request->input('location');
+        $fields_json = $request->input('fields_json');
+        $api = $request->input('api');
         if ($id) {
             $classify = Classify::find($id);
         } else {
             $classify = new Classify;
+            if(!$api) {
+                $classify->api = "option_order/store";
+            }
         }
         if ($pid && $name && $info && $summary && $server && $content && $photo && $location) {
             $classify->pid = $pid;
@@ -343,6 +180,7 @@ class ClassifyController extends Controller
             $classify->content = $content;
             $classify->photo = $photo;
             $classify->location = $location;
+            $classify->fields_json = $fields_json;
             $classify->save();
             return Response()->json([
                 "status" => 0,

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

@@ -25,7 +25,7 @@ class OptionOrderController extends Controller
 
         $wechat_id = $request->header("openid");
 
-        $option_ids = $request->input("options");
+        $options = $request->input("options");
         $id = $request->input("id");
         $address = $request->input('address');
         $contact = $request->input('contact');
@@ -36,13 +36,7 @@ class OptionOrderController extends Controller
         $status = $request->input('status');
         $photo = $request->input('photo');
 
-        if($option_ids && $address && $contact && $phone && $classify) {
-            $kvs = [];
-            foreach ($option_ids as $option_id) {
-                $option_value = OptionValue::with("optionKey")->find($option_id);
-                $kvs[$option_value->optionKey->key] = $option_value->value;
-            }
-
+        if($options && $address && $contact && $phone && $classify) {
             if(!$id) {
                 $option_order = new OptionOrder;
                 $option_order->status = 0;
@@ -57,7 +51,7 @@ class OptionOrderController extends Controller
             $option_order->phone = $phone;
             $option_order->notes = $notes;
             $option_order->classify = $classify;
-            $option_order->options = json_encode($kvs, JSON_UNESCAPED_UNICODE);
+            $option_order->options = json_encode($options, JSON_UNESCAPED_UNICODE);
             if($classify) {
                 $classify2 = $this->classify_name[$classify]->name;
                 $pid = $this->classify_name[$classify]->pid;
@@ -78,7 +72,6 @@ class OptionOrderController extends Controller
             return Response()->json([
                 "status" => -1,
                 "message" => "信息不能为空!",
-                "options" => $option_ids
             ]);
         }
     }

manage-server/app/Models/Classify.php

@@ -15,6 +15,8 @@ class Classify extends Model
         'content', // 服务详情
         'photo', // 首页显示的
         'location', // 显示位置
+        'fields_json', // 自定义字段
+        'api', // 接口字段
     ];
 
     protected $children = [];

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

@@ -24,6 +24,8 @@ class CreateClassifiesTable extends Migration
             $table->string('server');
             $table->string('photo');
             $table->string('location');
+            $table->text('fields_json');
+            $table->string('api');
         });
     }
 

manage-server/routes/web.php

@@ -35,7 +35,7 @@ Route::middleware(['manage.token'])->group(function () {
     Route::get('/classify/{id}', 'ClassifyController@get');
     Route::get('/{order_type}/comments', 'CommonController@type_comments');
     Route::post('/{order_type}/status', 'CommonController@status');
-    Route::post('/{order_type}/price', 'CommonController@price');
+    Route::post('/{order_type}/price', 'CommonController@price')->where('order_type', '^[^r]');
     Route::get('/{order_type}/{id}', 'CommonController@get')->where('id', '[0-9]+');
     Route::delete('/{order_type}/{id}', 'CommonController@delete')->where('id', '[0-9]+');