添加企业介绍

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

@@ -144,68 +144,31 @@ class CommonController extends Controller
         //$wechat_id = $user->getId();
         $wechat_id = $request->input("openid");
         if($wechat_id) {
+            $os = array();
             $houseApplianceCleanOrder = HouseApplianceCleanOrder::where("wechat_id", $wechat_id)->get();
             $houseCleanOrder = HouseCleanOrder::where("wechat_id", $wechat_id)->get();
             $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 = 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);
+            array_push($os, $houseApplianceCleanOrder);
+            array_push($os, $houseCleanOrder);
+            array_push($os, $housekeeperOrder);
+            array_push($os, $maternityMatronOrder);
+            array_push($os, $productOrder);
+            $orders = array();
+            foreach ($os as $o) {
+                foreach ($o 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["date"];
+                    array_push($orders, $data);
+                }
             }
-
-
             return Response()->json([
                 "status" => 0,
                 "data" => $orders