From 2edb239d7154de7571472fc4f4c6ed1b4ce279d3 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Wed, 3 Jun 2026 17:36:58 +0800 Subject: [PATCH] no message --- components/list/apply.vue | 4 ++-- components/list/applyPage.vue | 56 ++++++++++++++++++++++++++++++++++++------- pages/order/index.vue | 39 ++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 10 deletions(-) diff --git a/components/list/apply.vue b/components/list/apply.vue index df6ceca..dd8296c 100644 --- a/components/list/apply.vue +++ b/components/list/apply.vue @@ -42,8 +42,8 @@ {{ item.userName }}{{ item.setTitle }} -
- {{ item.time }} +
+ {{ item.newtime }}
diff --git a/components/list/applyPage.vue b/components/list/applyPage.vue index 32f5f33..6ac895b 100644 --- a/components/list/applyPage.vue +++ b/components/list/applyPage.vue @@ -273,6 +273,37 @@ export default { } }, methods: { + formatRelativeTime(timeStr) { + if (!timeStr) { + return "--"; + } + let now = new Date().getTime(); + let time = new Date(timeStr).getTime(); + + if (isNaN(time)) { + return "--"; + } + + let diff = now - time; + + let minute = 60 * 1000; + let hour = 60 * minute; + let day = 24 * hour; + + if (diff < minute) { + return "刚刚"; + } else if (diff < hour) { + return Math.floor(diff / minute) + "分钟前"; + } else if (diff < day) { + return Math.floor(diff / hour) + "小时前"; + } else { + let date = new Date(time); + let year = date.getFullYear(); + let month = String(date.getMonth() + 1).padStart(2, '0'); + let day = String(date.getDate()).padStart(2, '0'); + return year + "年" + month + "月" + day + "日"; + } + }, reachBottom() { let that = this; this.G.isLogin(); @@ -317,29 +348,38 @@ export default { // backgroundColorBottom: "#ffffff", // }); res.recordList.forEach((item, index) => { + console.log('=====================', item) if (item.status == 10) { // 待审核 报名时间 - item.time = that.G.getPointTime(item.createTime, "MM--DD HH:MM"); + item.ordered_time = that.G.getPointTime(item.createTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.createTime || item.updateTime); } else if (item.status == 20) { // 待接待 预约接待时间 - item.time = that.G.getPointTime(item.receptionTime, "MM--DD HH:MM"); + item.ordered_time = that.G.getPointTime(item.receptionTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.receptionTime || item.updateTime); } else if (item.status == 21 || item.status == 26 || item.status == 35 || item.status == 48 || item.status == 45) { // 已完成 完成时间 - item.time = that.G.getPointTime(item.finishTime, "MM--DD HH:MM"); + item.ordered_time = that.G.getPointTime(item.finishTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.finishTime || item.updateTime); } else if (item.status == 25) { // 待面试 面试时间 - item.time = that.G.getPointTime(item.interviewTime, "MM--DD HH:MM"); + item.ordered_time = that.G.getPointTime(item.interviewTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.interviewTime || item.updateTime); } else if (item.status == 30) { // 待入职 预约入职时间 - item.time = that.G.getPointTime(item.willEntryTime, "MM--DD HH:MM"); + item.ordered_time = that.G.getPointTime(item.willEntryTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.willEntryTime || item.updateTime); } else if (item.status == 40) { // 已入职 入职时间 - item.time = that.G.getPointTime(item.entryTime, "MM--DD HH:MM"); + item.ordered_time = that.G.getPointTime(item.entryTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.entryTime || item.updateTime); } else if (item.status == 50) { // 已离职 离职时间 - item.time = that.G.getPointTime(item.leaveTime, "MM--DD HH:MM"); + item.ordered_time = that.G.getPointTime(item.leaveTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.leaveTime || item.updateTime); } else { - item.time = that.G.getPointTime(item.updateTime, "MM--DD HH:MM"); + item.ordered_time = that.G.getPointTime(item.updateTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.updateTime || item.updateTime); } if (item.status != -1) { item.status_text = that.G.getOrderStatus().filter((itm, inx) => { diff --git a/pages/order/index.vue b/pages/order/index.vue index 07cd00b..2098a6b 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -215,6 +215,37 @@ export default { } }, methods: { + formatRelativeTime(timeStr) { + if (!timeStr) { + return "--"; + } + let now = new Date().getTime(); + let time = new Date(timeStr).getTime(); + + if (isNaN(time)) { + return "--"; + } + + let diff = now - time; + + let minute = 60 * 1000; + let hour = 60 * minute; + let day = 24 * hour; + + if (diff < minute) { + return "刚刚"; + } else if (diff < hour) { + return Math.floor(diff / minute) + "分钟前"; + } else if (diff < day) { + return Math.floor(diff / hour) + "小时前"; + } else { + let date = new Date(time); + let year = date.getFullYear(); + let month = String(date.getMonth() + 1).padStart(2, '0'); + let day = String(date.getDate()).padStart(2, '0'); + return year + "年" + month + "月" + day + "日"; + } + }, reachBottom() { let that = this; this.G.isLogin(); @@ -262,26 +293,34 @@ export default { if (item.status == 10) { // 待审核 报名时间 item.time = that.G.getPointTime(item.createTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.createTime); } else if (item.status == 20) { // 待接待 预约接待时间 item.time = that.G.getPointTime(item.receptionTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.receptionTime); } else if (item.status == 21 || item.status == 26 || item.status == 35 || item.status == 48 || item.status == 45) { // 已完成 完成时间 item.time = that.G.getPointTime(item.finishTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.finishTime); } else if (item.status == 25) { // 待面试 面试时间 item.time = that.G.getPointTime(item.interviewTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.interviewTime); } else if (item.status == 30) { // 待入职 预约入职时间 item.time = that.G.getPointTime(item.willEntryTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.willEntryTime); } else if (item.status == 40) { // 已入职 入职时间 item.time = that.G.getPointTime(item.entryTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.entryTime); } else if (item.status == 50) { // 已离职 离职时间 item.time = that.G.getPointTime(item.leaveTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.leaveTime); } else { item.time = that.G.getPointTime(item.updateTime, "MM--DD HH:MM"); + item.newtime = that.formatRelativeTime(item.updateTime); } item.status_text = that.G.getOrderStatus().filter((itm, inx) => {