Merge remote-tracking branch 'origin/warning' into warning

曾国涛
2 parents fc028195 07a17e98
Showing 2 changed files with 20 additions and 3 deletions
src/models/count.ts
src/pages/Order/Order/index.tsx
+// 全局共享数据示例
+import { useState } from 'react';
+
+const useOpenModal = () => {
+  const [openCount, setOpenCount] = useState<number>();
+  return {
+    openCount,
+    setOpenCount,
+  };
+};
+
+export default useOpenModal;
@@ -59,6 +59,7 @@ import {
   ProFormInstance,
   ProTable,
 } from '@ant-design/pro-components';
+import { useModel } from '@umijs/max';
 import {
   Button,
   Card,
@@ -4540,14 +4541,17 @@ const OrderPage = () =&gt; {
   }
   const [invoiceWarningNum, setInvoiceWarningNum] = useState(0);
   const [invoiceRefundWarningNum, setInvoiceRefundWarningNum] = useState(0);
-  const [open, setOpen] = useState(false);
+  const [open, setOpen] = useState(true);
+  const { openCount, setOpenCount } = useModel('count');
   async function getInvoiceWarningNum() {
     const res = await postServiceOrderWarningOrderStatistics();
     if (
-      res.data.waitConfirmInvoice !== 0 ||
-      res.data.waitConfirmReceipt !== 0
+      (res.data.waitConfirmInvoice !== 0 ||
+        res.data.waitConfirmReceipt !== 0) &&
+      openCount !== 1
     ) {
       setOpen(true);
+      setOpenCount(1);
     }
     setInvoiceWarningNum(res.data.waitConfirmInvoice);
     setInvoiceRefundWarningNum(res.data.waitConfirmReceipt);
@@ -4559,6 +4563,7 @@ const OrderPage = () =&gt; {
   //隐藏弹窗
   const hideModal = () => {
     setOpen(false);
+    window.location.href = '/order/OrderWarning';
   };
   return (
     <div className="order-page-container">