Merge branch 'feat/liujie'

src/components/GameManagePopup/index.tsx

@@ -31,7 +31,7 @@ const CancelPopup = forwardRef((props, ref) => {
         visible={visible}
         showHeader={false}
         hideFooter
-        zIndex={1001}
+        zIndex={1002}
         enableDragToClose={false}
         onClose={onClose}
       >

src/game_pages/detail/index.tsx

@@ -284,9 +284,7 @@ function StickyButton(props) {
         action: async () => {
           const res = await OrderService.getUnpaidOrder(id);
           if (res.code === 0) {
-            navto({
-              url: `/order_pages/orderDetail/index?id=${res.data.order_info.order_id}`,
-            });
+            navto(`/order_pages/orderDetail/index?id=${res.data.order_info.order_id}`);
           }
         },
       };
@@ -880,9 +878,7 @@ function OrganizerInfo(props) {
   };
 
   function handleViewGame(gameId) {
-    navto({
-      url: `/game_pages/detail/index?id=${gameId}&from=current`,
-    });
+    navto(`/game_pages/detail/index?id=${gameId}&from=current`);
   }
 
   return (
@@ -1087,9 +1083,7 @@ function Index() {
       }
       return;
     }
-    navto({
-      url: `/order_pages/orderDetail/index?gameId=${id}`,
-    });
+    navto(`/order_pages/orderDetail/index?gameId=${id}`);
   };
 
   function onStatusChange(result) {
@@ -1110,9 +1104,7 @@ function Index() {
   }
 
   function handleViewUserInfo(userId) {
-    navto({
-      url: `/user_pages/other/index?userid=${userId}`,
-    });
+    navto(`/user_pages/other/index?userid=${userId}`);
   }
 
   console.log("detail", detail);