From c63b5aa8412fe9bd7f9c50f222a86caeaaa1fe00 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 13 Jun 2022 09:49:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/active/activity.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/active/activity.vue b/src/views/active/activity.vue
index a303a4b..da8e87b 100644
--- a/src/views/active/activity.vue
+++ b/src/views/active/activity.vue
@@ -34,8 +34,8 @@
               </div>
 
               <div v-else-if="column.type=='dateRange'">
-                {{dateRange}}
-                <!-- {{scope.row["start_time"]+"-"+changeEndTime(scope.row["end_time"])}} -->
+                <!-- {{dateRange}} -->
+                {{scope.row["start_time"]+"-"+changeEndTime(scope.row["end_time"])}}
               </div>
               <div v-else-if="column.type=='status'">
                 <el-tag v-if="scope.row['status']==1" type="" effect="dark">
@@ -168,6 +168,7 @@
                 style="width:100%"
                 v-model="dateRange"
                 type="datetimerange"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 range-separator="至"
                 start-placeholder="活动开始日期"
                 end-placeholder="活动结束日期">