From a1006d3e4c5a1c83ad359311c5827af8a0815745 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sat, 11 Feb 2023 17:15:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B4=BB=E5=8A=A8=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E6=9C=AA=E8=AE=BE=E7=BD=AE=E5=BC=80=E5=A7=8B=E5=92=8C=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moreActive/MoreActive.vue | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue
index 91fde0d..9855ec4 100644
--- a/src/views/moreActive/MoreActive.vue
+++ b/src/views/moreActive/MoreActive.vue
@@ -96,20 +96,34 @@
               </div>
               <div>
                 <span>活动考勤：</span>
-                <span class="content">
+                <span v-if="data?.beforeSignIn!=='0'" class="content">
                   {{
                     data?.beforeSignIn
                       ? "活动开始前" + data?.beforeSignIn + "分钟开始签到"
                       : "-"
                   }}
                 </span>
-                <span class="content">
+                <span v-if="data?.beforeSignIn=='0' && data?.afterSignIn=='0'" class="content">
+                  {{
+                    data?.beforeSignIn
+                      ? "活动在  " + data?.activityStartTime + ""
+                      : "-"
+                  }}
+                </span>
+                <span v-if="data?.afterSignIn!=='0'" class="content">
                   {{
                     data?.afterSignIn
                       ? "活动开始后" + data?.afterSignIn + "分钟结束签到"
                       : "-"
                   }}
                 </span>
+                <span v-if="data?.beforeSignIn=='0' && data?.afterSignIn=='0'" class="content">
+                  {{
+                    data?.afterSignIn
+                      ? " ~ " + data?.activityEndTime + " 时间段内允许签到"
+                      : "-"
+                  }}
+                </span>
               </div>
               <!--
               <div>