fix

 <!--
  * @Date: 2022-09-26 16:10:35
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-25 16:25:19
+ * @LastEditTime: 2022-10-25 17:08:45
  * @FilePath: /swx/src/components/activity-bar.vue
  * @Description: 活动详情页底部导航栏
 -->
@@ -17,7 +17,18 @@
         </view>
       </van-col>
       <van-col span="19">
-        <view v-if="!isEnd">
+        <!-- <view v-if="isEnd == 1">
+          <view class="activity-close">
+            <view class="button">活动结束</view>
+          </view>
+        </view>
+        <view v-else-if="activityStatus === '报名结束'">
+          <view class="user-reg">
+            <view class="button">报名结束</view>
+          </view>
+        </view> -->
+        <!-- TODO: 后期看一下控制是不是放在里边的页面去做 -->
+        <view>
           <view v-if="userType === 'volunteer'" class="user-not-reg">
             <view class="button" @tap="goTo('volunteer')">义工报名</view>
             <view class="button" @tap="goTo('join')">活动报名</view>
@@ -36,11 +47,6 @@
             <view class="button" @tap="goTo('volunteer')">义工报名</view>
           </view>
         </view>
-        <view v-else>
-          <view class="activity-close">
-            <view class="button" @tap="goTo('info')">活动结束</view>
-          </view>
-        </view>
       </van-col>
     </van-row>
   </view>
@@ -62,6 +68,7 @@ const props = defineProps({
   regId: String,
   memberRole : String,
   isEnd : String,
+  activityStatus : String,
 })
 
 const goTo = (type) => {

 <!--
  * @Date: 2022-09-20 15:39:37
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-25 16:37:35
+ * @LastEditTime: 2022-10-25 16:59:43
  * @FilePath: /swx/src/components/activity-card.vue
  * @Description: 活动卡片组件
 -->
@@ -90,7 +90,6 @@ const formatStatus = (item) => {
   } else if (dayjs(item.activity_time).isBefore(dayjs(item.server_time))) {
     return '活动进行中';
   }
-  return 'mo'
 }
 
 const goTo = (id, status) => {