添加企业介绍

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

@@ -149,17 +149,66 @@ class CommonController extends Controller
             $housekeeperOrder = HousekeeperOrder::where("wechat_id", $wechat_id)->get();
             $maternityMatronOrder = MaternityMatronOrder::where("wechat_id", $wechat_id)->get();
             $productOrder = ProductOrder::where("wechat_id", $wechat_id)->get();
-            $orders = [];
+            $orders = array();
+            foreach ($houseApplianceCleanOrder as $order) {
+                $data = [];
+                $data["id"] = $order->id;
+                $data["classify1"] = $order->classify1;
+                $data["classify2"] = $order->classify2;
+                $data["status"] = $order->status;
+                $data["price"] = $order->price;
+                $data["created_at"] = $order->created_at;
+                array_push($orders, $data);
+            }
+
+            foreach ($houseCleanOrder as $order) {
+                $data = [];
+                $data["id"] = $order->id;
+                $data["classify1"] = $order->classify1;
+                $data["classify2"] = $order->classify2;
+                $data["status"] = $order->status;
+                $data["price"] = $order->price;
+                $data["created_at"] = $order->created_at;
+                array_push($orders, $data);
+            }
+
+            foreach ($housekeeperOrder as $order) {
+                $data = [];
+                $data["id"] = $order->id;
+                $data["classify1"] = $order->classify1;
+                $data["classify2"] = $order->classify2;
+                $data["status"] = $order->status;
+                $data["price"] = $order->price;
+                $data["created_at"] = $order->created_at;
+                array_push($orders, $data);
+            }
+
+            foreach ($maternityMatronOrder as $order) {
+                $data = [];
+                $data["id"] = $order->id;
+                $data["classify1"] = $order->classify1;
+                $data["classify2"] = $order->classify2;
+                $data["status"] = $order->status;
+                $data["price"] = $order->price;
+                $data["created_at"] = $order->created_at;
+                array_push($orders, $data);
+            }
+
+            foreach ($productOrder as $order) {
+                $data = [];
+                $data["id"] = $order->id;
+                $data["classify1"] = $order->classify1;
+                $data["classify2"] = $order->classify2;
+                $data["status"] = $order->status;
+                $data["price"] = $order->price;
+                $data["created_at"] = $order->created_at;
+                array_push($orders, $data);
+            }
+
 
             return Response()->json([
                 "status" => 0,
-                "data" => [
-                    "houseApplianceCleanOrder" => $houseApplianceCleanOrder,
-                    "houseCleanOrder" => $houseCleanOrder,
-                    "housekeeperOrder" => $housekeeperOrder,
-                    "maternityMatronOrder" => $maternityMatronOrder,
-                    "productOrder" => $productOrder
-                ]
+                "data" => $orders
             ]);
         }