Pārlūkot izejas kodu

根据build修改代码

zhangzf 2 nedēļas atpakaļ
vecāks
revīzija
25d9fd9466

+ 4 - 9
src/app/(public)/customer/(has-dashboard)/order/history/_components/OrderHistory.tsx

@@ -342,24 +342,19 @@ export default function OrderHistory() {
                     <span>{order.total}</span>
                   </p>
 
-                  <div className="flex justify-between mt-3">
+                  <div className="flex justify-end mt-3">
                     <Link
                       href={`/customer/order/view/order_id/${order.id}`}
-                      className="text-black-600 text-sm underline"
+                      className="text-black-600 text-sm underline items-end"
                     >
                       View Order
                     </Link>
-                    <Link
+                    {/* <Link
                       href={`/customer/order/track/order_id/${order.id}`}
-                      // state={{
-                      //   addressData: {
-                      //     /* 你的地址对象 */
-                      //   },
-                      // }}
                       className="border border-gray-300 rounded-full px-4 py-1 text-sm text-gray-800 hover:bg-gray-50"
                     >
                       Track Order
-                    </Link>
+                    </Link> */}
                   </div>
                 </div>
               </div>

+ 9 - 4
src/app/(public)/customer/(has-dashboard)/order/view/order_id/[id]/page.tsx

@@ -36,9 +36,14 @@ export default async function OrderDetail({ params }: { params: Params }) {
       id: Number(orderId),
     },
   });
-  console.log("父组件 orderDetailData:", orderDetailData.customerOrder); 
+  console.log("父组件 orderDetailData:", orderDetailData?.customerOrder); 
   // const orderData: OrderData = res.body.data;
   // console.log("父组件 orderData:", orderData, !!orderData); 
+  const customerOrder = orderDetailData?.customerOrder;
+
+  if (!customerOrder) {
+    return <div>Loading / 订单不存在</div>;
+  }
   return (
     <div className="min-h-screen bg-white">
       {/* 顶部固定导航栏(客户端组件:返回按钮) */}
@@ -46,13 +51,13 @@ export default async function OrderDetail({ params }: { params: Params }) {
 
       {/* 商品列表:循环渲染,自动兼容1件或多件商品 */}
           <ProductList
-        orderData={orderDetailData.customerOrder}
+        orderData={orderDetailData?.customerOrder}
       />
 
       <div className="">
         {/* 收货信息、支付信息区块 */}
-        <OrderInfoBlock orderData={orderDetailData.customerOrder} />
-         <OrderAddressCard orderData={orderDetailData.customerOrder}/>
+        <OrderInfoBlock orderData={orderDetailData?.customerOrder} />
+         <OrderAddressCard orderData={orderDetailData?.customerOrder}/>
         {/* 分享按钮区域 */}
         <div className="my-6">
           <h3 className="text-lg font-bold mb-4">Share order:</h3>

+ 4 - 4
src/types/customer/accountOrderDetail/order.ts

@@ -1,8 +1,8 @@
 // @/types/order/customer-order.ts
 export type CustomerOrderResponse = {
-  data: {
+  // data: {
     customerOrder: CustomerOrder;
-  };
+  // };
 };
 
 export type CustomerOrder = {
@@ -20,8 +20,8 @@ export type CustomerOrder = {
   rewardPointsUsed: number;
   rewardPointsAmount: number;
   rewardPointsEarned: number;
-  vipPlusAmount: string | null;
-  vipDiscountAmount: string | null;
+  vipPlusAmount: number | null;
+  vipDiscountAmount: number | null;
   shippingAmount: number;
   shippingTitle: string;
   shippingInsuranceAmount: string;