修改订单列表

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

@@ -155,7 +155,7 @@ class CommonController extends Controller
             array_push($os, $houseCleanOrder);
             array_push($os, $housekeeperOrder);
             array_push($os, $maternityMatronOrder);
-            array_push($os, $productOrder);
+            //array_push($os, $productOrder);
             $orders = array();
             for ($i = 0; $i < sizeof($os); $i++) {
                 foreach ($os[$i] as $order) {
@@ -170,6 +170,17 @@ class CommonController extends Controller
                     array_push($orders, $data);
                 }
             }
+            foreach ($productOrder as $order) {
+                $data = [];
+                $data["id"] = $order->id;
+                $data["classify1"] = $order->classify1;
+                $data["classify2"] = $order->color . "x" . $order->amount;
+                $data["status"] = $order->status;
+                $data["price"] = $order->price;
+                $data["order_type"] = $order->order_type;
+                //$data["created_at"] = $order->created_at->date;
+                array_push($orders, $data);
+            }
             return Response()->json([
                 "status" => 0,
                 "data" => $orders