Merge branch 'master' of http://git.sotype.com/chenxiqiang/houseworking

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

@@ -30,6 +30,7 @@ class HousekeeperOrderController extends Controller
         $address = $request->input('address');
         $contact = $request->input('contact');
         $phone = $request->input('phone');
+        $notes = $request->input('notes');
         $status = $request->input('status');
         $price = $request->input('price');
         //$photo = $request->input('photo');
@@ -51,6 +52,7 @@ class HousekeeperOrderController extends Controller
             $housekeeperOrder->area = $area;
             $housekeeperOrder->address = $address;
             $housekeeperOrder->contact = $contact;
+            $housekeeperOrder->notes = $notes;
             $housekeeperOrder->phone = $phone;
             $housekeeperOrder->wechat_id = $wechat_id;
             $housekeeperOrder->photo = "https://wechat.sotype.com/storage/gOtuHM3GvKva6x68N340DJuN6cX1oIfaAhWi8yoq.jpeg";

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

@@ -42,6 +42,7 @@ class CreateHousekeeperOrdersTable extends Migration
             $table->integer('status');
             $table->double('price');
             $table->string('photo');
+            $table->string('notes');
             $table->unsignedInteger('comment_id');
             $table->timestamp("paid_at");
         });