linwenxin 4 hónapja
szülő
commit
9017719ffd
3 módosított fájl, 19 hozzáadás és 7 törlés
  1. 8 0
      package-lock.json
  2. 1 0
      package.json
  3. 10 7
      src/packageWorkorder/pages/mixins/orderBtnsShow.js

+ 8 - 0
package-lock.json

@@ -11855,6 +11855,14 @@
       "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
       "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
     },
+    "moment-timezone": {
+      "version": "0.5.46",
+      "resolved": "https://registry.npmmirror.com/moment-timezone/-/moment-timezone-0.5.46.tgz",
+      "integrity": "sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==",
+      "requires": {
+        "moment": "^2.29.4"
+      }
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz",

+ 1 - 0
package.json

@@ -110,6 +110,7 @@
     "js-perform-lock": "^1.0.5",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
+    "moment-timezone": "^0.5.46",
     "node-sass": "^4.14.1",
     "regenerator-runtime": "^0.12.1",
     "uni-read-pages": "^1.0.5",

+ 10 - 7
src/packageWorkorder/pages/mixins/orderBtnsShow.js

@@ -1,17 +1,20 @@
 import { getStorage } from '@/common/utils/storage.js'
+import moment from 'moment-timezone'
+// 设置时区为中国
+moment.tz.setDefault('Asia/Shanghai')
+
 export default {
   methods: {
     isTodayOrYesterday(timeString) {
-      const date = new Date(timeString)
-      const now = new Date()
+      const date = moment(timeString)
+      const now = moment()
 
       // 获取今天和昨天的日期
-      const today = new Date(now.getFullYear(), now.getMonth(), now.getDate())
-      const yesterday = new Date(today)
-      yesterday.setDate(today.getDate() - 1)
+      const today = now.startOf('day')
+      const yesterday = today.clone().subtract(1, 'days')
 
-      // 判断给定时间是否在今天或昨天
-      return date >= yesterday && date < today
+      // 判断给定日期是否在今天或昨天
+      return date.isSame(today, 'day') || date.isSame(yesterday, 'day')
     },
     orderStatus_v_zh(orderStatus, item) {
       if (item?.isImportExcel && item?.isMeet === false) {