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>( + '/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) { )} - {/* 退款成功状态:显示再次购买 */} - {item.orderStatus === 6 && ( - - )} )}