From bc1a63d4df15b1b046865d90906ff62164ce77b6 Mon Sep 17 00:00:00 2001
From: yuepenglong <1547476325@qq.com>
Date: Fri, 28 Mar 2025 14:24:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/votingElection.ts          | 15 +++++++++++++++
 src/pages/votingElection/index.vue | 19 ++++++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 src/api/votingElection.ts

diff --git a/src/api/votingElection.ts b/src/api/votingElection.ts
new file mode 100644
index 0000000..5cf736a
--- /dev/null
+++ b/src/api/votingElection.ts
@@ -0,0 +1,15 @@
+import { request } from '@/utils/http'
+
+// 获取投票选举（正在进行）
+export function getCategoryData() {
+    return request.http({
+        url: '/api/vote_progress'
+    })
+}
+
+export function feedback(data: any) {
+    return request.http({
+        url: '/api/t.feedback/add',
+        data
+    })
+}
\ No newline at end of file
diff --git a/src/pages/votingElection/index.vue b/src/pages/votingElection/index.vue
index 126385a..ca427dc 100644
--- a/src/pages/votingElection/index.vue
+++ b/src/pages/votingElection/index.vue
@@ -1,44 +1,47 @@
 <script setup lang="ts">
+	import { getCategoryData } from '../../api/votingElection'
+	
 const doSearch = (_formData: { page: number; limit: number }, onSuccess: Function) => {
     // const submitData = { ...formData }
     // listApi(submitData, userStore.useType).then((res) => {
     //     const { data } = res as { data: { data: any; total: number } }
     //     onSuccess({ data })
     // })
+	
     onSuccess({
         data: {
             data: [
                 {
                     id: 1,
-                    img: '/static/img/grxx.png',
+                    img: '',
                     name: '陈志远',
                     class: '现任财务总监',
                     yijian: ''
                 },
                 {
                     id: 2,
-                    img: '/static/img/grxx.png',
+                    img: '',
                     name: '陈志远',
                     class: '现任财务总监',
                     yijian: ''
                 },
                 {
                     id: 3,
-                    img: '/static/img/grxx.png',
+                    img: '',
                     name: '陈志远',
                     class: '现任财务总监',
                     yijian: ''
                 },
                 {
                     id: 4,
-                    img: '/static/img/grxx.png',
+                    img: '',
                     name: '陈志远',
                     class: '现任财务总监',
                     yijian: ''
                 },
                 {
                     id: 5,
-                    img: '/static/img/grxx.png',
+                    img: '',
                     name: '陈志远',
                     class: '现任财务总监',
                     yijian: ''
@@ -80,6 +83,12 @@ const selectBut = (data: any, cardid: any, type: string, butname: string) => {
         }
     })
 }
+
+onShow(()=> {
+	getCategoryData().then((res)=> {
+		console.log(res,55555555555)
+	})
+})
 </script>
 
 <template>