diff --git a/src/components/GameManagePopup/index.tsx b/src/components/GameManagePopup/index.tsx
index d321287..46ad70b 100644
--- a/src/components/GameManagePopup/index.tsx
+++ b/src/components/GameManagePopup/index.tsx
@@ -123,12 +123,17 @@ export default forwardRef(function GameManagePopup(props, ref) {
function handleEditGame() {
Taro.navigateTo({
- url: `/publish_pages/publishBall/index?gameId=${detail.id}`,
+ url: `/publish_pages/publishBall/index?gameId=${detail.id}&republish=0`,
});
onClose();
}
- const handleRepubGame = handleEditGame;
+ function handleRepubGame () {
+ Taro.navigateTo({
+ url: `/publish_pages/publishBall/index?gameId=${detail.id}&republish=1`,
+ });
+ onClose();
+ }
async function handleCancelGame() {
cancelRef.current.show(async (result) => {
diff --git a/src/order_pages/orderDetail/index.tsx b/src/order_pages/orderDetail/index.tsx
index 716d386..1962064 100644
--- a/src/order_pages/orderDetail/index.tsx
+++ b/src/order_pages/orderDetail/index.tsx
@@ -9,7 +9,7 @@ import orderService, {
CancelType,
GameOrderRes,
OrderStatus,
- RefundStatus,
+ refundTextMap,
} from "@/services/orderService";
import {
payOrder,
@@ -27,12 +27,6 @@ import styles from "./index.module.scss";
dayjs.locale("zh-cn");
-const refundTextMap = new Map([
- [RefundStatus.NONE, "已支付"],
- [RefundStatus.PENDING, "退款中"],
- [RefundStatus.SUCCESS, "已退款"],
-]);
-
const gameNoticeMap = new Map([
[
"pending",
diff --git a/src/order_pages/orderList/index.tsx b/src/order_pages/orderList/index.tsx
index 71a027f..cd0ff1a 100644
--- a/src/order_pages/orderList/index.tsx
+++ b/src/order_pages/orderList/index.tsx
@@ -5,7 +5,7 @@ import { Avatar, Dialog } from "@nutui/nutui-react-taro";
import dayjs from "dayjs";
import "dayjs/locale/zh-cn";
import classnames from "classnames";
-import orderService, { OrderStatus, CancelType } from "@/services/orderService";
+import orderService, { OrderStatus, CancelType, refundTextMap } from "@/services/orderService";
import { withAuth, RefundPopup } from "@/components";
import { payOrder, generateOrderActions } from "@/utils";
import emptyContent from "@/static/emptyStatus/publish-empty.png";
@@ -285,7 +285,7 @@ const OrderList = () => {
styles[unPay ? "pending" : "paid"]
)}
>
- {unPay ? "待支付" : "已支付"} ¥{" "}
+ {unPay ? "待支付" : refundTextMap.get(item.refund_status)} ¥{" "}
{item.amount}
diff --git a/src/services/orderService.ts b/src/services/orderService.ts
index 787267e..7d3dd1e 100644
--- a/src/services/orderService.ts
+++ b/src/services/orderService.ts
@@ -28,6 +28,12 @@ export enum RefundStatus {
SUCCESS, // 已退款
}
+export const refundTextMap = new Map([
+ [RefundStatus.NONE, "已支付"],
+ [RefundStatus.PENDING, "退款中"],
+ [RefundStatus.SUCCESS, "已退款"],
+]);
+
export interface PayMentParams {
order_id: number;
order_no: string;