修改my/order接口

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

@@ -195,7 +195,8 @@ class CommonController extends Controller
                 ->orderBy('id', 'desc')->get();*/
             $maternityMatronOrder = MaternityMatronOrder::where("wechat_id", $wechat_id)
                 ->orderBy('id', 'desc')->get();
-            $productOrder = ProductOrder::where("wechat_id", $wechat_id)
+
+            $productOrder = ProductOrder::with("products")->where("wechat_id", $wechat_id)
                 ->orderBy('id', 'desc')->get();
 
             $optionOrder = OptionOrder::where("wechat_id", $wechat_id)
@@ -238,21 +239,33 @@ class CommonController extends Controller
                     array_push($orders, $data);
                 }
             }
+            $productData = [];
             foreach ($productOrder as $order) {
                 $data = [];
                 $data["id"] = $order->id;
-                $data["classify1"] = $order->product_name;
-                $data["classify2"] = $order->color . "x" . $order->amount;
                 $data["status"] = $order->status;
                 $data["price"] = $order->price;
                 $data["order_type"] = "product_order";
-                $data["photo"] = $order->photo;
                 $data["created_at"] = $order->created_at->toDateTimeString();
+                $data["products"] = [];
+                foreach ($order["products"] as $prd) {
+                    $productTmp = [];
+                    $productTmp["id"] = $prd["id"];
+                    $productTmp["name"] = $prd["name"];
+                    $productTmp["classify"] = $prd["classify"];
+                    $productTmp["color"] = $prd["color"];
+                    $productTmp["price"] = $prd["price"];
+                    $productTmp["photo"] = $prd["photo"];
+                    $productTmp["amount"] = $prd["pivot"]["product_amount"];
+                    array_push($data["products"], $productTmp);
+                }
+
                 if($order->comment_id) {
                     $data["comment"] = true;
                 } else {
                     $data["comment"] = false;
                 }
+
                 // 未支付订单1小时后过期
                 if($order->status === 0) {
                     if(Carbon::now()->subHour()->gt($order->created_at)) {
@@ -263,11 +276,14 @@ class CommonController extends Controller
                 } else if($order->status === 3) {
                     continue;
                 }
-                array_push($orders, $data);
+                array_push($productData, $data);
             }
             return Response()->json([
                 "status" => 0,
-                "data" => $orders
+                "data" => [
+                    "others" => $orders,
+                    "product_orders" => $productData
+                ]
             ]);
         }