From e692324cdf60cfb8ba1cf4a770a172286b1f3037 Mon Sep 17 00:00:00 2001
From: liruiqiang <3151805288@qq.com>
Date: Tue, 21 Oct 2025 17:31:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/landingDetail.vue | 45 ++++++++++++++++++++++++++-------------
 src/views/admin/landingList.vue   | 18 +++++++++++++---
 2 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/src/views/admin/landingDetail.vue b/src/views/admin/landingDetail.vue
index 01bf438..fe2c31b 100644
--- a/src/views/admin/landingDetail.vue
+++ b/src/views/admin/landingDetail.vue
@@ -111,15 +111,13 @@
 </template>
 
 <script>
-import { getLandingListApi, exportLandingDetailApi } from '../../api/member.js';
+import { getLandingDetailApi, exportLandingDetailApi } from '../../api/member.js';
 import { ElMessage } from 'element-plus';
 
 export default {
   name: 'LandingDetail',
   data() {
     return {
-      // 活动详情数据
-      detailData: '详情',
       // 筛选表单数据
       filterForm: {
         startTime: '',
@@ -167,7 +165,7 @@ export default {
     const activityId = this.$route.params.id;
     if (activityId) {
       // 调用接口获取活动详情及相关数据
-      this.getActivityDetail(activityId);
+      this.getLandingDetail(activityId);
     } else {
       ElMessage.error('未获取到活动ID，无法加载详情');
     }
@@ -178,15 +176,30 @@ export default {
       this.$router.back();
     },
 
-    // 获取活动详情及表格数据
-    async getActivityDetail(id) {
+    // 格式化时间为 'YYYY-MM-DD HH:mm:ss'
+    formatDateTime(date) {
+        if (!date) return '';
+        const year = date.getFullYear();
+        const month = String(date.getMonth() + 1).padStart(2, '0');
+        const day = String(date.getDate()).padStart(2, '0');
+        const hours = String(date.getHours()).padStart(2, '0');
+        const minutes = String(date.getMinutes()).padStart(2, '0');
+        const seconds = String(date.getSeconds()).padStart(2, '0');
+        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    },
+
+    // 获取活动详情数据
+    async getLandingDetail(id) {
       this.loading = true;
       try {
-        const res = await getLandingListApi({
-          id: id, // 活动ID
+        const { startTime, endTime, status } = this.filterForm;
+        const res = await getLandingDetailApi({
+          id: id, 
           page: this.currentPage,
           pageSize: this.pageSize,
-          ...this.filterForm 
+          startTime: this.formatDateTime(startTime),
+          endTime: this.formatDateTime(endTime),
+          status: status
         });
 
         if (res.code === 200) {
@@ -205,17 +218,19 @@ export default {
     // 执行查询操作
     handleQuery() {
       this.currentPage = 1;
-      this.getActivityDetail(this.$route.params.id);
+      this.getLandingDetail(this.$route.params.id);
     },
 
     // 执行导出操作
     handleExport() {
       this.loading = true;
       try {
-        // 调用导出接口（携带活动ID和筛选条件）
+        const { startTime, endTime, status } = this.filterForm;
         exportLandingDetailApi({
           id: this.$route.params.id,
-          ...this.filterForm
+          startTime: this.formatDateTime(startTime),
+          endTime: this.formatDateTime(endTime),
+          status: status
         }).then(res => {
           if (res.code === 200) {
             ElMessage.success('导出成功');
@@ -224,7 +239,7 @@ export default {
             const url = URL.createObjectURL(blob);
             const a = document.createElement('a');
             a.href = url;
-            a.download = `${this.detailData?.name || '活动数据'}.xlsx`;
+            a.download = `${'活动数据'}.xlsx`;
             a.click();
             URL.revokeObjectURL(url);
           } else {
@@ -242,13 +257,13 @@ export default {
     handleSizeChange(val) {
       this.pageSize = val;
       this.currentPage = 1;
-      this.getActivityDetail(this.$route.params.id);
+      this.getLandingDetail(this.$route.params.id);
     },
 
     // 分页页码变更
     handleCurrentChange(val) {
       this.currentPage = val;
-      this.getActivityDetail(this.$route.params.id);
+      this.getLandingDetail(this.$route.params.id);
     }
   }
 }
diff --git a/src/views/admin/landingList.vue b/src/views/admin/landingList.vue
index b8502fb..0b735bb 100644
--- a/src/views/admin/landingList.vue
+++ b/src/views/admin/landingList.vue
@@ -383,6 +383,18 @@ export default {
       reader.readAsDataURL(file.raw);
     },
 
+    // 格式化时间为 'YYYY-MM-DD HH:mm:ss'
+    formatDateTime(date) {
+        if (!date) return '';
+        const year = date.getFullYear();
+        const month = String(date.getMonth() + 1).padStart(2, '0');
+        const day = String(date.getDate()).padStart(2, '0');
+        const hours = String(date.getHours()).padStart(2, '0');
+        const minutes = String(date.getMinutes()).padStart(2, '0');
+        const seconds = String(date.getSeconds()).padStart(2, '0');
+        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    },
+
     // 提交表单（新增/编辑）
     submitForm() {
       this.$refs.formRef.validate((valid) => {
@@ -392,15 +404,15 @@ export default {
             id: this.form.id,
             name: this.form.name,
             intro: this.form.intro,
-            startTime: this.form.startTime,
-            endTime: this.form.endTime,
+            startTime: formatDateTime(this.form.startTime),
+            endTime: formatDateTime(this.form.endTime),
             landingPage: this.form.landingPage,
             popup: this.form.popup
           }).then(res => {
             if (res.code === 200) {
               ElMessage.success('操作成功');
               this.dialogVisible = false;
-              this.getLandingList(); // 刷新列表
+              this.getLandingList();
             } else {
               ElMessage.error(res.msg || '操作失败');
             }