修改订单列表

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

@@ -153,11 +153,11 @@ class CommonController extends Controller
         $wechat_id = $request->input("openid");
         if($wechat_id) {
             $os = array();
-            $houseApplianceCleanOrder = HouseApplianceCleanOrder::where("wechat_id", $wechat_id)->toList();
-            $houseCleanOrder = HouseCleanOrder::where("wechat_id", $wechat_id)->toList();
-            $housekeeperOrder = HousekeeperOrder::where("wechat_id", $wechat_id)->toList();
-            $maternityMatronOrder = MaternityMatronOrder::where("wechat_id", $wechat_id)->toList();
-            $productOrder = ProductOrder::where("wechat_id", $wechat_id)->toList();
+            $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();
 
             array_push($os, $houseApplianceCleanOrder);
             array_push($os, $houseCleanOrder);
@@ -168,25 +168,25 @@ class CommonController extends Controller
             for ($i = 0; $i < sizeof($os); $i++) {
                 foreach ($os[$i] as $order) {
                     $data = [];
-                    $data["id"] = $order["id"];
-                    $data["classify1"] = $order["classify1"];
-                    $data["classify2"] = $order["classify2"];
-                    $data["status"] = $order["status"];
-                    $data["price"] = $order["price"];
-                    $data["order_type"] = $order["order_type"];
-                    $data["created_at"] = $order["created_at"];
+                    $data["id"] = $order->id;
+                    $data["classify1"] = $order->classify1;
+                    $data["classify2"] = $order->classify2;
+                    $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);
                 }
             }
             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"];
+                $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([