fix: 弹窗跳转一次

boyang
1 parent 07a17e98
Showing 3 changed files with 25 additions and 11 deletions
.umirc.ts
src/models/count.ts
src/pages/Order/Order/index.tsx
@@ -14,7 +14,7 @@ export default defineConfig({
   },
   proxy: {
     '/api/': {
-      target: 'http://localhost:8085/',
+      target: 'http://localhost:8086/',
       // target: 'http://192.168.1.6:8085/',
       // target: 'http://39.108.227.113:8085/',
       changeOrigin: true,
@@ -2,7 +2,7 @@
 import { useState } from 'react';
  
 const useOpenModal = () => {
-  const [openCount, setOpenCount] = useState<number>();
+  const [openCount, setOpenCount] = useState<number>(0);
   return {
     openCount,
     setOpenCount,
@@ -128,6 +128,8 @@ import ShippingWarehouseChangeModal from &#39;./components/ShippingWarehouseChangeMo
 import UploadPayBillModal from './components/UploadPayBillModal';
 import './index.less';
 import { OrderListItemType, OrderType } from './type.d';
+// import { useNavigate } from 'react-router-dom';
+import { history } from '@umijs/max';
  
 const OrderPage = () => {
   const [orderDrawerVisible, setOrderDrawerVisible] = useState<boolean>(false);
@@ -212,6 +214,7 @@ const OrderPage = () =&gt; {
   const [ids, setIds] = useState([]);
   const [recordOptNode, setRecordOptNode] = useState(null);
   const roleCode = userInfo?.roleSmallVO?.code;
+  // const navigate = useNavigate();
   const canMergeInvoicing = useMemo(() => {
     if (subOrderSelectedMap.size === 0) {
       return false;
@@ -4517,17 +4520,18 @@ const OrderPage = () =&gt; {
   }
   const [invoiceWarningNum, setInvoiceWarningNum] = useState(0);
   const [invoiceRefundWarningNum, setInvoiceRefundWarningNum] = useState(0);
-  const [open, setOpen] = useState(true);
+  const [open, setOpen] = useState(false);
   const { openCount, setOpenCount } = useModel('count');
   async function getInvoiceWarningNum() {
     const res = await postServiceOrderWarningOrderStatistics();
     if (
       (res.data.waitConfirmInvoice !== 0 ||
         res.data.waitConfirmReceipt !== 0) &&
-      openCount !== 1
+      openCount !== true
     ) {
+      setOpenCount(true);
       setOpen(true);
-      setOpenCount(1);
+      console.log(openCount, '5656openindex');
     }
     setInvoiceWarningNum(res.data.waitConfirmInvoice);
     setInvoiceRefundWarningNum(res.data.waitConfirmReceipt);
@@ -4536,10 +4540,15 @@ const OrderPage = () =&gt; {
     //预警订单数
     getInvoiceWarningNum();
   }, []);
-  //隐藏弹窗
-  const hideModal = () => {
+  // 隐藏弹窗
+  const navigateToWarning = () => {
     setOpen(false);
-    window.location.href = '/order/OrderWarning';
+    // history.push('/order/OrderWarning');
+    // window.location.replace = '/order/OrderWarning';
+    // navigate('/order/OrderWarning');
+    history.push('/order/OrderWarning');
+    // location.href = '/order/OrderWarning';
+    // history.pushState(null, '', '/order/OrderWarning');
   };
   return (
     <div className="order-page-container">
@@ -4551,7 +4560,12 @@ const OrderPage = () =&gt; {
         width={800}
         closable={false}
         footer={[
-          <Button key="confirm" size="large" type="primary" onClick={hideModal}>
+          <Button
+            key="confirm"
+            size="large"
+            type="primary"
+            onClick={navigateToWarning}
+          >
             去处理
           </Button>,
         ]}
@@ -4653,10 +4667,10 @@ const OrderPage = () =&gt; {
         <div style={{ color: 'red', padding: '40px' }}>
           <p>预警说明：</p>
           <p>
-            1、从订单确认收货之日起，超过5天未和客户确认发票（不开票的订单除外）的订单将会进行第一次提醒；超过15天未和客户确认发票（不开票的订单除外）的订单将会每天进行一次提醒，并限制下单功能
+            1、从申请开票之日起，超过5天未【确认发票】的订单在登录时进行第一次提醒，超过15天未【确认发票】将进行每日提醒并锁单。
           </p>
           <p>
-            2、从发票确认之日起，超过15天未确认回款的订单将会进行第一次提醒，超过25天未确认回款的订单将会每天进行一次提醒，并限制下单功能
+            2、从【确认发票】之日起，超过15天未【回款】的订单在账号登录时会进行第一次提醒，超过25天未【回款】将进行每日提醒并锁单。
           </p>
         </div>
       </Modal>