diff --git a/src/api/spring/user/index.js b/src/api/spring/user/index.js index 76b8dfb..741ef7d 100644 --- a/src/api/spring/user/index.js +++ b/src/api/spring/user/index.js @@ -8,6 +8,14 @@ export function getUserList(data) { }) } +export function getVipUserList(data) { + return request({ + url: '/management/api/spring/user/vip/list', + method: 'get', + params: data, + }) +} + export function getUserFeedbackList(data) { return request({ url: '/management/api/common/feedback/list', diff --git a/src/router/index.js b/src/router/index.js index 34b32de..4717b94 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -227,6 +227,12 @@ export const asyncRoutes = [ component: () => import('@/views/spring/user/user/index'), meta: { title: '用户' }, }, + { + path: 'vipUser', + name: 'VipUser', + component: () => import('@/views/spring/user/vipUser/index'), + meta: { title: '会员用户' }, + }, { path: 'userChat', name: 'UserChat', diff --git a/src/utils/index.js b/src/utils/index.js index b04d547..14b2a78 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -70,14 +70,27 @@ export function formatTime(time, option) { const now = new Date() const diff = (now - time) / 1000 - if (diff < 30) { - return '刚刚' - } else if (diff < 3600) { - return `${Math.ceil(diff / 60)}分钟前` - } else if (diff < 3600 * 24) { - return `${Math.ceil(diff / 3600)}小时前` - } else if (diff < 3600 * 24 * 2) { - return '1天前' + if (diff < 0) { + const absDiff = Math.abs(diff) + if (absDiff < 30) { + return '刚刚' + } else if (absDiff < 3600) { + return `${Math.ceil(absDiff / 60)}分钟后` + } else if (absDiff < 3600 * 24) { + return `${Math.ceil(absDiff / 3600)}小时后` + } else if (absDiff < 3600 * 24 * 2) { + return '1天后' + } + } else { + if (diff < 30) { + return '刚刚' + } else if (diff < 3600) { + return `${Math.ceil(diff / 60)}分钟前` + } else if (diff < 3600 * 24) { + return `${Math.ceil(diff / 3600)}小时前` + } else if (diff < 3600 * 24 * 2) { + return '1天前' + } } if (option) { diff --git a/src/views/index/utils/index.js b/src/views/index/utils/index.js index eaa1010..42a6b8f 100644 --- a/src/views/index/utils/index.js +++ b/src/views/index/utils/index.js @@ -35,4 +35,5 @@ export const userMap = { '6985a7c7f76d8026019f4e28': '妈妈', '697a34996c4283e7b5904dbd': '哎萌', '6973765449d17414b66970a2': '我', + '697da7f1af55ae2451863526': '姐姐', } diff --git a/src/views/spring/user/vipUser/index.vue b/src/views/spring/user/vipUser/index.vue new file mode 100644 index 0000000..970134a --- /dev/null +++ b/src/views/spring/user/vipUser/index.vue @@ -0,0 +1,268 @@ + + + + +