|
@@ -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) {
|