Merge remote-tracking branch 'origin/warning'

曾国涛
2 parents 6ffe487f 450f13df
Showing 1 changed file with 11 additions and 2 deletions
src/pages/Order/Order/index.tsx
@@ -131,7 +131,7 @@ import &#39;./index.less&#39;;
 import { OrderListItemType, OrderType } from './type.d';
 // import { useNavigate } from 'react-router-dom';
 import { history } from '@umijs/max';
-import { format } from 'fecha';
+// import { format } from 'fecha';
 const OrderPage = () => {
   const [orderDrawerVisible, setOrderDrawerVisible] = useState<boolean>(false);
@@ -4590,10 +4590,19 @@ const OrderPage = () =&gt; {
   }
   function setOriginTime(value) {
     const currentDate = new Date();
+
     // 创建一个新的日期对象，并在当前日期的基础上加上 daysToAdd 天
     const newDate = new Date(currentDate);
     newDate.setDate(currentDate.getDate() - value);
-    const formattedDate = format(newDate, 'yyyy-MM-dd HH:mm:ss');
+    // 检查日期是否有效，并格式化输出
+    function formatDate(date) {
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需加1
+      const day = String(date.getDate()).padStart(2, '0'); // 确保是两位数
+      return `${year}-${month}-${day} ${date.toTimeString().split(' ')[0]}`; // 获取时间部分
+    }
+    const formattedDate = formatDate(newDate);
+    // const formattedDate = format(newDate, 'YYYY-MM-dd HH:mm:ss');
     return formattedDate;
   }
   const [invoiceWarningNum, setInvoiceWarningNum] = useState(0);