From e8746fe5bb553c17e0052958d9c39a5e2bc6f6a1 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 15 七月 2025 14:58:32 +0800
Subject: [PATCH] 商家端活动申请

---
 manager/src/views/activity/index.vue |   58 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/manager/src/views/activity/index.vue b/manager/src/views/activity/index.vue
index ad53333..9043862 100644
--- a/manager/src/views/activity/index.vue
+++ b/manager/src/views/activity/index.vue
@@ -582,16 +582,15 @@
   addActivity,
   editActivity,
   delActivityById,
+  delActivityBatch,
   activityChangeStatus,
   activityChangeRecommend,
   activityMembersPage,
   auditActivity
 } from "@/api/activity.js"
-import Editor from '@/components/editor/index.vue'
 import { uploadFileByLmk, delByKey } from "@/api/common.js"
 
 import { quillEditor } from 'vue-quill-editor'
-import Delta from 'quill-delta'
 import 'quill/dist/quill.core.css';
 import 'quill/dist/quill.snow.css';
 import 'quill/dist/quill.bubble.css';
@@ -667,7 +666,7 @@
 
 export default {
   name: "ActivityManagement",
-  components: {Editor, quillEditor},
+  components: { quillEditor},
   data() {
     return {
       auditForm: {
@@ -845,17 +844,39 @@
           }
         },
         {
-          title: '瀹℃牳',
+          title: '瀹℃牳鐘舵��',
           key: 'auditStatus',
           width: 100,
           align: 'center',
           render: (h, params) => {
+            const status = params.row.auditStatus;
+            let tagText, tagColor;
+
+            // 鏍规嵁鐘舵�佽缃枃妗堝拰棰滆壊
+            switch (status) {
+              case 0:
+                tagText = '瀹℃牳涓�';
+                tagColor = 'orange';  // 姗欒壊琛ㄧず杩涜涓�
+                break;
+              case 1:
+                tagText = '宸插鏍�';
+                tagColor = 'green';   // 缁胯壊琛ㄧず閫氳繃
+                break;
+              case 2:
+                tagText = '鏈�氳繃';
+                tagColor = 'red';     // 绾㈣壊琛ㄧず鎷掔粷
+                break;
+              default:
+                tagText = '鏈煡鐘舵��';
+                tagColor = 'default'; // 榛樿鐏拌壊
+            }
+
             return h('Tag', {
               props: {
-                color: params.row.auditStatus === 0 ? 'default' : 'green'
-              }
-            }, params.row.auditStatus === 0 ? '鏈鏍�' : '宸插鏍�')
-          }
+                color: tagColor,
+              },
+            }, tagText);
+          },
         },
         {
           title: '鐘舵��',
@@ -876,6 +897,17 @@
                 color: currentStatus.color
               }
             }, currentStatus.text);
+          }
+        },
+        {
+          title: '娲诲姩鎶ュ悕鏃堕棿娈�',
+          key: 'activityReportTimeRange',
+          width: 300,
+          render: (h, params) => {
+            return h('div', [
+              h('div', `寮�濮�: ${this.formatDate(params.row.reportStartTime)}`),
+              h('div', `缁撴潫: ${this.formatDate(params.row.reportEndTime)}`)
+            ])
           }
         },
         {
@@ -982,9 +1014,9 @@
           render: (h, params) => {
             return h('Tag', {
               props: {
-                color: params.row.disabled ? 'red' : 'green'
+                color: params.row.disabled ? 'green' : 'red' //true 姝ｅ父 false琚鐢�
               }
-            }, params.row.disabled ? '绂佺敤' : '姝ｅ父')
+            }, params.row.disabled ? '姝ｅ父' : '绂佺敤')
           }
         }
       ],
@@ -1052,7 +1084,6 @@
 
     // 澶卞幓鐒︾偣
     onEditorBlur(editor) {
-
     },
 
     // 鑾峰緱鐒︾偣
@@ -1396,6 +1427,8 @@
       title: '纭鍒犻櫎',
       content: `纭畾瑕佸垹闄ゆ椿鍔� "${row.activityName}" 鍚�?`,
       onOk: () => {
+        //TODO 鍏堝垽鏂椿鍔ㄦ槸鍚﹀彂甯冿紝鍙戝竷鍒欓渶瑕佸厛涓嬫灦
+
         delActivityById(row.id).then(res => {
           if (res.code === 200) {
             this.$Message.success(res.msg)
@@ -1408,6 +1441,7 @@
 
   // 鎵归噺鍒犻櫎
   delBatch() {
+    //TODO 鍏堝垽鏂椿鍔ㄦ槸鍚﹀彂甯冿紝鍙戝竷鍒欓渶瑕佸厛涓嬫灦
     if (this.selectCount === 0) {
       this.$Message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
       return
@@ -1417,7 +1451,7 @@
       title: '纭鍒犻櫎',
       content: `纭畾瑕佸垹闄ら�変腑鐨� ${this.selectCount} 鏉℃暟鎹悧?`,
       onOk: () => {
-        delActivityBatch({ids: this.selectList}).then(res => {
+        delActivityBatch(this.selectList).then(res => {
           if (res.code === 200) {
             this.$Message.success(res.msg)
             this.selectList = []

--
Gitblit v1.8.0