Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Hooke
/
swx_weapp
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Network
Create a new issue
Commits
Issue Boards
Authored by
hookehuyr
2022-10-31 18:43:21 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
84b9bae07a8b1b9d8ff0b23dc671ced1173ea3a0
84b9bae0
1 parent
8fd2d5fe
替换moment功能
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
src/components/activity-card.vue
src/pages/createActivity/index.vue
src/pages/joinList/index.vue
src/components/activity-card.vue
View file @
84b9bae
<!--
* @Date: 2022-09-20 15:39:37
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2022-10-31 1
7:13:44
* @LastEditTime: 2022-10-31 1
8:37:02
* @FilePath: /swx/src/components/activity-card.vue
* @Description: 活动卡片组件
-->
...
...
@@ -86,13 +86,13 @@ const formatStatus = (item) => {
return '已结束';
} else if (item?.status === 'disable') {
return '未发布';
} else if (
moment(item.server_time).isBefore(moment(item.reg_begin_time)
)) {
} else if (
+new Date(item.server_time) > +new Date(item.reg_begin_time
)) {
return '报名未开始';
} else if (
moment(item.reg_begin_time).isBefore(moment(item.server_time)) && moment(item.server_time).isBefore(moment(item.reg_end_time)
)) {
} else if (
+new Date(item.reg_begin_time) > +new Date(item.server_time) && +new Date(item.server_time) > +new Date(item.reg_end_time
)) {
return '报名中';
} else if (
moment(item.reg_end_time).isBefore(moment(item.server_time)) && moment(item.server_time).isBefore(moment(item.activity_time)
)) {
} else if (
+new Date(item.reg_end_time) > +new Date(item.server_time) && +new Date(item.server_time) > +new Date(item.activity_time
)) {
return '报名结束';
} else if (
moment(item.activity_time).isBefore(moment(item.server_time)
)) {
} else if (
+new Date(item.activity_time) > +new Date(item.server_time
)) {
return '活动进行中';
}
}
...
...
src/pages/createActivity/index.vue
View file @
84b9bae
<!--
* @Date: 2022-09-21 16:04:10
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2022-10-31 1
7:26:24
* @LastEditTime: 2022-10-31 1
8:42:52
* @FilePath: /swx/src/pages/createActivity/index.vue
* @Description: 创建活动页面
-->
...
...
@@ -693,11 +693,11 @@ const validForm = () => { // 校验表单
Toast('报名截止时间不能为空');
return false;
}
if (
!moment(reg_begin_time.value).isBefore(moment(reg_end_time.value)
)) {
if (
+new Date(reg_begin_time.value) > +new Date(reg_end_time.value
)) {
Toast('报名开始时间不能晚于报名截止时间');
return false;
}
if (
!moment(activity_time.value).isBetween(moment(reg_begin_time.value), moment(reg_end_time.value), null, '[]'
)) {
if (
+new Date(activity_time.value) < +new Date(reg_begin_time.value) || +new Date(activity_time.value) > (reg_end_time.value
)) {
Toast('活动时间请在报名时间之间');
return false;
}
...
...
src/pages/joinList/index.vue
View file @
84b9bae
...
...
@@ -159,7 +159,7 @@ export default {
const info = await activityInfoAPI({ i: getCurrentPageParam().id });
if (info.code) {
// 判断是否超过活动时间
if (
moment(info.data.activity.activity_time).isBefore(moment(info.data.server_time)
)) {
if (
+new Date(info.data.activity.activity_time) > +new Date(info.data.server_time
)) {
this.absent = true;
}
}
...
...
Please
register
or
login
to post a comment