diff --git a/src/views/match/coupon/index.vue b/src/views/match/coupon/index.vue index aeea63d..518194a 100644 --- a/src/views/match/coupon/index.vue +++ b/src/views/match/coupon/index.vue @@ -70,9 +70,9 @@ - @@ -120,14 +120,39 @@ import { auths } from '/@/utils/authFunction'; import ProTable from '/@/components/ProTable/index.vue'; import { couponPage, couponAdd, couponEdit, couponDelete, couponEventlistGet, couponGeneratecodePost } from '/@/api/match/coupon'; -// 格式化日期,只显示年月日 +// 格式化日期,显示完整时间(YYYY-MM-DD HH:MM) const formatDate = (dateStr) => { if (!dateStr) return ''; - if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) { + // 如果已经是日期时间格式,直接返回(或调整格式) + try { + const date = new Date(dateStr); + if (isNaN(date.getTime())) return dateStr; + const year = date.getFullYear(); + const month = String(date.getMonth() + 1).padStart(2, '0'); + const day = String(date.getDate()).padStart(2, '0'); + const hours = String(date.getHours()).padStart(2, '0'); + const minutes = String(date.getMinutes()).padStart(2, '0'); + return `${year}-${month}-${day} ${hours}:${minutes}`; + } catch (e) { + return dateStr; + } +}; + +// 格式化日期为选择器用的格式 +const formatDateTimePicker = (dateStr) => { + if (!dateStr) return ''; + try { + const date = new Date(dateStr); + if (isNaN(date.getTime())) return dateStr; + const year = date.getFullYear(); + const month = String(date.getMonth() + 1).padStart(2, '0'); + const day = String(date.getDate()).padStart(2, '0'); + const hours = String(date.getHours()).padStart(2, '0'); + const minutes = String(date.getMinutes()).padStart(2, '0'); + return `${year}-${month}-${day} ${hours}:${minutes}`; + } catch (e) { return dateStr; } - // 截取前10个字符(YYYY-MM-DD) - return dateStr.slice(0, 10); }; // 定义表单引用类型 @@ -209,9 +234,9 @@ const onOpenMenu = async (row) => { if (row) { formData.value = { ...row, - startTime: formatDate(row.startTime), - endTime: formatDate(row.endTime), - time: [formatDate(row.startTime), formatDate(row.endTime)], + startTime: formatDateTimePicker(row.startTime), + endTime: formatDateTimePicker(row.endTime), + time: [formatDateTimePicker(row.startTime), formatDateTimePicker(row.endTime)], }; } else { formData.value = { diff --git a/src/views/match/points/config/index.vue b/src/views/match/points/config/index.vue index 44ed81a..1ef94cd 100644 --- a/src/views/match/points/config/index.vue +++ b/src/views/match/points/config/index.vue @@ -22,6 +22,7 @@ 删除 + 查看详情 @@ -29,37 +30,34 @@ - + - - - - +
-
+
新增区间
- +