Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/user/order/components/OrderList.tsx
#	src/user/order/refund/index.tsx
This commit is contained in:
2026-02-24 16:28:27 +08:00
2 changed files with 27 additions and 13 deletions

View File

@@ -277,7 +277,7 @@ const RefundPage: React.FC = () => {
// 调用API提交退款申请
const result = await applyAfterSale(params)
if (result.success) {
// 更新订单状态为"客户端申请退款"
if (orderId) {