添加商家备注remark，添加列表搜索条件keyword

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

@@ -38,6 +38,7 @@ class MaternityMatronOrderController extends Controller
         $phone = $request->input('phone');
         $status = $request->input('status');
         $price = $request->input('price');
+        $remark = $request->input('remark');
         if ($id) {
             $maternityMatronOrder = MaternityMatronOrder::find($id);
             $maternityMatronOrder->status = $status;
@@ -56,6 +57,7 @@ class MaternityMatronOrderController extends Controller
             $maternityMatronOrder->level = $level;
             $maternityMatronOrder->expected_date = $expected_date;
             $maternityMatronOrder->special_demand = $special_demand;
+            $maternityMatronOrder->remark = $remark;
             $maternityMatronOrder->server_time = $server_time;
             $maternityMatronOrder->address = $address;
             $maternityMatronOrder->contact = $contact;
@@ -83,6 +85,17 @@ class MaternityMatronOrderController extends Controller
      */
     public function list(Request $request)
     {
-        return MaternityMatronOrder::paginate(20);
+        $keyword = $request->input('keyword');
+        if($keyword) {
+            $data = MaternityMatronOrder::where("special_demand", $keyword)
+                ->orWhere("contact", $keyword)
+                ->orWhere("phone", $keyword)
+                ->orWhere("remark", $keyword)
+                ->paginate();
+        } else {
+            $data = MaternityMatronOrder::paginate();
+        }
+        $data->appends(["keyword" => $keyword]);
+        return $data;
     }
 }

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

@@ -34,6 +34,7 @@ class OptionOrderController extends Controller
         $classify = $request->input('type');
         $price = $request->input('price');
         $status = $request->input('status');
+        $remark = $request->input('remark');
 
         if($options && $address && $contact && $phone && $classify) {
             if(!$id) {
@@ -49,6 +50,7 @@ class OptionOrderController extends Controller
             $option_order->contact = $contact;
             $option_order->phone = $phone;
             $option_order->notes = $notes;
+            $option_order->remark = $remark;
             $option_order->classify = $classify;
             $option_order->options = json_encode($options, JSON_UNESCAPED_UNICODE);
             if($classify) {
@@ -76,6 +78,11 @@ class OptionOrderController extends Controller
     }
 
 
+    /**
+     * 每页20进行分页
+     * @param Request $request
+     * @return mixed
+     */
     /**
      * 每页20进行分页
      * @param Request $request
@@ -83,10 +90,18 @@ class OptionOrderController extends Controller
      */
     public function list(Request $request)
     {
-        $classify = $request->input("classify");
-        if($classify) {
-            return OptionOrder::where("classify", $classify)->paginate(20);
+        $keyword = $request->input('keyword');
+        if($keyword) {
+            $data = MaternityMatronOrder::where("notes", $keyword)
+                ->orWhere("contact", $keyword)
+                ->orWhere("classify", $keyword)
+                ->orWhere("phone", $keyword)
+                ->orWhere("remark", $keyword)
+                ->paginate();
+        } else {
+            $data = MaternityMatronOrder::paginate();
         }
-        return OptionOrder::paginate(20);
+        $data->appends(["keyword" => $keyword]);
+        return $data;
     }
 }

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

@@ -60,7 +60,7 @@ class ProductOrderController extends Controller
             $productOrder->address = $address;
             $productOrder->contact = $contact;
             $productOrder->phone = $phone;
-            $productOrder->photo = "https://wechat.sotype.com/storage/gOtuHM3GvKva6x68N340DJuN6cX1oIfaAhWi8yoq.jpeg";
+            $productOrder->photo = $photo;//"https://wechat.sotype.com/storage/gOtuHM3GvKva6x68N340DJuN6cX1oIfaAhWi8yoq.jpeg";
             $productOrder->wechat_id = $wechat_id;
             $productOrder->save();
             return Response()->json([
@@ -83,6 +83,19 @@ class ProductOrderController extends Controller
      */
     public function list(Request $request)
     {
-        return ProductOrder::paginate(20);
+        $keyword = $request->input('keyword');
+        if($keyword) {
+            $data = ProductOrder::where("product_name", $keyword)
+                ->orWhere("contact", $keyword)
+                ->orWhere("remark", $keyword)
+                ->orWhere("info", $keyword)
+                ->orWhere("phone", $keyword)
+                ->paginate();
+        } else {
+            $data = ProductOrder::paginate();
+        }
+        $data->appends(["keyword" => $keyword]);
+        return $data;
     }
+
 }

manage-server/app/Models/MaternityMatronOrder.php

@@ -18,6 +18,7 @@ class MaternityMatronOrder extends Order
             'expected_date', // 预产期
             'server_time', // 服务时间
             'special_demand', // 特殊需求
+            'remark', // 商家备注
         ];
         parent::mergeFillable(parent::getFillable(), $fillable);
     }

manage-server/app/Models/OptionOrder.php

@@ -10,6 +10,7 @@ class OptionOrder extends Order
         parent::__construct("option_order");
         $fillable = [
             'options',
+            'remark', // 商家备注
         ];
         parent::mergeFillable(parent::getFillable(), $fillable);
     }

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

@@ -33,6 +33,7 @@ class CreateMaternityMatronOrdersTable extends Migration
             $table->string('expected_date');
             $table->string('server_time');
             $table->string('special_demand');
+            $table->string('remark');
             $table->string('contact');
             $table->string('address');
             $table->string('phone');

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

@@ -25,6 +25,7 @@ class CreateOptionOrdersTable extends Migration
             $table->double('price');
             $table->string('photo');
             $table->string('notes');
+            $table->string('remark');
             $table->unsignedInteger('classify');
             $table->string('classify1');
             $table->string('classify2');