调整时间相关逻辑

 <!--
  * @Date: 2022-09-20 15:39:37
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-31 18:37:02
+ * @LastEditTime: 2022-10-31 19:15:12
  * @FilePath: /swx/src/components/activity-card.vue
  * @Description: 活动卡片组件
 -->
@@ -20,7 +20,7 @@
               <van-tag v-if="data.mode === 'online'" :round="true" color="#E9FAF4" text-color="#199A74" size="large">线上活动</van-tag>
               <van-tag v-if="formatStatus(data) === '未发布'" :round="true" color="#FFF5E4" text-color="#FF7300" size="large">{{ formatStatus(data) }}</van-tag>
               <van-tag v-else-if="formatStatus(data) === '已结束'" :round="true" color="#EDEDED" text-color="#909090" size="large">{{ formatStatus(data) }}</van-tag>
-              <van-tag v-else :round="true" color="#D7FFD7" text-color="#019200" size="large">{{ formatStatus(data) }}</van-tag>
+              <van-tag v-else-if="formatStatus(data)" :round="true" color="#D7FFD7" text-color="#019200" size="large">{{ formatStatus(data) }}</van-tag>
             </view>
             <view style="font-size: 0.95rem;">
               <van-icon name="clock-o" color="#BBBBBB" />&nbsp;{{ formatDate(data.activity_time) }}
@@ -82,17 +82,18 @@ const formatDate = (date) => {
 }
 
 const formatStatus = (item) => {
+  console.warn(item);
   if (item?.is_end) {
     return '已结束';
   } else if (item?.status === 'disable') {
     return '未发布';
-  } else if (+new Date(item.server_time) > +new Date(item.reg_begin_time)) {
+  } else if (+new Date(item.server_time) < +new Date(item.reg_begin_time)) {
     return '报名未开始';
   } 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 (+new Date(item.reg_end_time) > +new Date(item.server_time) && +new Date(item.server_time) > +new Date(item.activity_time)) {
+  } else if (+new Date(item.server_time) > +new Date(item.reg_end_time)) {
     return '报名结束';
-  } else if (+new Date(item.activity_time) > +new Date(item.server_time)) {
+  } else if (+new Date(item.activity_time) < +new Date(item.server_time)) {
     return '活动进行中';
   }
 }

 <!--
  * @Date: 2022-09-21 14:51:44
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-31 17:31:18
+ * @LastEditTime: 2022-10-31 19:06:46
  * @FilePath: /swx/src/pages/my/index.vue
  * @Description: 我的页面
 -->
@@ -164,9 +164,9 @@ export default {
     if (code) {
       data.activity_list.forEach(item => {
         item.server_time = data.server_time;
-        item.reg_begin_time = this.formatDate(data.reg_begin_time);
-        item.reg_end_time = this.formatDate(data.reg_end_time);
-        item.activity_time = this.formatDate(data.activity_time);
+        item.reg_begin_time = this.formatDate(item.reg_begin_time);
+        item.reg_end_time = this.formatDate(item.reg_end_time);
+        item.activity_time = this.formatDate(item.activity_time);
       })
       this.activity_list = data.activity_list;
       this.nickname = data.user.nickname;

 <!--
  * @Date: 2022-09-19 14:11:06
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-31 17:16:06
+ * @LastEditTime: 2022-10-31 19:20:15
  * @FilePath: /swx/src/pages/myCreateActivity/index.vue
  * @Description: 创建的活动页面
 -->
@@ -164,6 +164,9 @@ export default {
       this.volunteer_count = data.volunteer_count ? data.volunteer_count : 0;
       this.player_count = data.player_count ? data.player_count : 0;
       this.server_time = this.formatDate(data.server_time);
+      this.activity_list.forEach(item => {
+        item.server_time = this.server_time
+      });
       this.page = this.page + 1;
     }
   },
@@ -246,6 +249,9 @@ export default {
           this.player_count = data.player_count ? data.player_count : 0;
           this.page = this.page + 1;
           this.flag = true;
+          this.activity_list.forEach(item => {
+            item.server_time = this.server_time
+          });
         } else {
           Toast('没有数据')
         }