Merge branch 'feat/liujie'
This commit is contained in:
@@ -31,7 +31,7 @@ const CancelPopup = forwardRef((props, ref) => {
|
|||||||
visible={visible}
|
visible={visible}
|
||||||
showHeader={false}
|
showHeader={false}
|
||||||
hideFooter
|
hideFooter
|
||||||
zIndex={1001}
|
zIndex={1002}
|
||||||
enableDragToClose={false}
|
enableDragToClose={false}
|
||||||
onClose={onClose}
|
onClose={onClose}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -284,9 +284,7 @@ function StickyButton(props) {
|
|||||||
action: async () => {
|
action: async () => {
|
||||||
const res = await OrderService.getUnpaidOrder(id);
|
const res = await OrderService.getUnpaidOrder(id);
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
navto({
|
navto(`/order_pages/orderDetail/index?id=${res.data.order_info.order_id}`);
|
||||||
url: `/order_pages/orderDetail/index?id=${res.data.order_info.order_id}`,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -880,9 +878,7 @@ function OrganizerInfo(props) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
function handleViewGame(gameId) {
|
function handleViewGame(gameId) {
|
||||||
navto({
|
navto(`/game_pages/detail/index?id=${gameId}&from=current`);
|
||||||
url: `/game_pages/detail/index?id=${gameId}&from=current`,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -1087,9 +1083,7 @@ function Index() {
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
navto({
|
navto(`/order_pages/orderDetail/index?gameId=${id}`);
|
||||||
url: `/order_pages/orderDetail/index?gameId=${id}`,
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
function onStatusChange(result) {
|
function onStatusChange(result) {
|
||||||
@@ -1110,9 +1104,7 @@ function Index() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function handleViewUserInfo(userId) {
|
function handleViewUserInfo(userId) {
|
||||||
navto({
|
navto(`/user_pages/other/index?userid=${userId}`);
|
||||||
url: `/user_pages/other/index?userid=${userId}`,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("detail", detail);
|
console.log("detail", detail);
|
||||||
|
|||||||
Reference in New Issue
Block a user