From 6d337086018f3191e5f488f7b22584acef5ee092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 5 Feb 2026 17:54:41 +0800
Subject: [PATCH] =?UTF-8?q?refactor(order):=20=E9=87=8D=E6=9E=84=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=A8=A1=E5=9D=97=E5=B9=B6=E7=A7=BB=E9=99=A4=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E8=B4=AD=E4=B9=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除订单列表中的再次购买功能及相关代码
- 更新API导入语句格式以提高可读性
- 添加退款订单API方法
- 清理未使用的导航函数导入
- 简化订单列表组件的按钮渲染逻辑
---
 src/api/shop/shopOrder/index.ts         | 15 +++++++++++
 src/user/order/components/OrderList.tsx | 34 +++++--------------------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/api/shop/shopOrder/index.ts b/src/api/shop/shopOrder/index.ts
index 2d64084..8e61482 100644
--- a/src/api/shop/shopOrder/index.ts
+++ b/src/api/shop/shopOrder/index.ts
@@ -178,3 +178,18 @@ export async function repairOrder(data: ShopOrder) {
   }
   return Promise.reject(new Error(res.message));
 }
+
+
+/**
+ * 申请|同意退款
+ */
+export async function refundShopOrder(data: ShopOrder) {
+  const res = await request.put<ApiResult<unknown>>(
+    '/shop/shop-order/refund',
+    data
+  );
+  if (res.code === 0) {
+    return res.message;
+  }
+  return Promise.reject(new Error(res.message));
+}
diff --git a/src/user/order/components/OrderList.tsx b/src/user/order/components/OrderList.tsx
index de553ee..ba80d11 100644
--- a/src/user/order/components/OrderList.tsx
+++ b/src/user/order/components/OrderList.tsx
@@ -4,13 +4,18 @@ import {View, Text} from '@tarojs/components'
 import Taro from '@tarojs/taro';
 import {InfiniteLoading} from '@nutui/nutui-react-taro'
 import dayjs from "dayjs";
-import {pageShopOrder, updateShopOrder, createOrder, getShopOrder, prepayShopOrder} from "@/api/shop/shopOrder";
+import {
+  pageShopOrder,
+  updateShopOrder,
+  createOrder,
+  getShopOrder,
+  prepayShopOrder
+} from "@/api/shop/shopOrder";
 import {OrderCreateRequest, ShopOrder, ShopOrderParam} from "@/api/shop/shopOrder/model";
 import {listShopOrderGoods} from "@/api/shop/shopOrderGoods";
 import {copyText} from "@/utils/common";
 import PaymentCountdown from "@/components/PaymentCountdown";
 import {PaymentType} from "@/utils/payment";
-import {goTo} from "@/utils/navigation";
 import {ErrorType, RequestError} from "@/utils/request";
 
 // 判断订单是否支付已过期
@@ -346,24 +351,6 @@ function OrderList(props: OrderListProps) {
   //   });
   // };
 
-  // 再次购买 (已完成状态)
-  const buyAgain = (order: ShopOrder) => {
-    console.log('再次购买:', order);
-    const goodsId = order.orderGoods?.[0]?.goodsId
-    if (!goodsId) {
-      Taro.showToast({
-        title: '订单商品信息缺失',
-        icon: 'none'
-      });
-      return;
-    }
-    goTo(`/shop/orderConfirm/index?goodsId=${goodsId}`)
-    // Taro.showToast({
-    //   title: '再次购买功能开发中',
-    //   icon: 'none'
-    // });
-  };
-
   // 取消订单
   const cancelOrder = (order: ShopOrder) => {
     setOrderToCancel(order);
@@ -845,13 +832,6 @@ function OrderList(props: OrderListProps) {
                           </Space>
                         )}
 
-                        {/* 退款成功状态：显示再次购买 */}
-                        {item.orderStatus === 6 && (
-                          <Button size={'small'} type="primary" onClick={(e) => {
-                            e.stopPropagation();
-                            buyAgain(item);
-                          }}>再次购买</Button>
-                        )}
                       </Space>
                       )}
                     </Space>