diff --git a/src/api/common.ts b/src/api/common.ts
index 692c02b..af0397f 100644
--- a/src/api/common.ts
+++ b/src/api/common.ts
@@ -15,3 +15,11 @@ export function getVoteDetail(data: { id: number }) {
         data
     })
 }
+
+export function getVoteResult(data: pageType) {
+    return request.http({
+        url: '/api/vote_result',
+        method: 'GET',
+        data
+    })
+}
diff --git a/src/pages.json b/src/pages.json
index 8156b95..af32e8a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -33,7 +33,7 @@
             "style": {
                 "navigationBarTitleText": "选举结果",
                 "navigationBarTextStyle": "white",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": true
             }
         },
         {
diff --git a/src/pages/electionResults/index.vue b/src/pages/electionResults/index.vue
index c087821..2b62554 100644
--- a/src/pages/electionResults/index.vue
+++ b/src/pages/electionResults/index.vue
@@ -1,11 +1,10 @@
 <script setup lang="ts">
+import { getVoteResult } from '@/api/common'
 const navto = (url: string, params = {}) => uni.$util.goToPage({ url, params })
-const doSearch = (_formData: { page: number; limit: number }, onSuccess: Function) => {
-    onSuccess({
-        data: {
-            data: [{ name: '测试一' }, { name: '测试二' }],
-            total: 4
-        }
+const doSearch = (formData: { page: number; limit: number }, onSuccess: Function) => {
+    getVoteResult(formData).then((res) => {
+        const { data } = res as { data: { data: any; total: number } }
+        onSuccess({ data })
     })
 }
 </script>
@@ -18,36 +17,38 @@ const doSearch = (_formData: { page: number; limit: number }, onSuccess: Functio
                     <view class="flex">
                         <view class="flex1">
                             <view class="flex-center-start">
-                                <text class="text-ellipsis title">{{ '2024年度学生会主席选举' }}</text>
-                                <!-- <text class="status b">进行中</text> -->
-                                <!-- <text class="status f">未开始</text> -->
-                                <text class="status e">已结束</text>
+                                <text class="text-ellipsis title">{{ row.title }}</text>
+                                <text class="status b" v-if="row.status === 2">进行中</text>
+                                <text class="status f" v-else-if="row.status === 1">未开始</text>
+                                <text class="status e" v-else>已结束</text>
                             </view>
-                            <view class="time">{{ '投票时间：2024-03-01 至 2024-03-07' }}</view>
+                            <view class="time">{{ `投票时间：${row.start_time} 至 ${row.end_time}` }}</view>
                         </view>
                         <view :class="{ arrow: true, active: row.showInfo }" @click="row.showInfo = !row.showInfo">
                             <u-icon name="arrow-down" color="#9CA3AF" />
                         </view>
                     </view>
                     <view class="info" v-if="row.showInfo">
-                        <view class="flex info-items" v-for="(v, k) of 2" :key="k">
-                            <view class="head"></view>
+                        <view class="flex info-items" v-for="(v, k) of row.candidate" :key="k">
+                            <view class="head">
+                                <image :src="v.photo" mode="aspectFill" />
+                            </view>
                             <view class="content flex1">
                                 <view class="name flex-center-start">
-                                    <text>陈佳怡</text>
-                                    <!-- <text class="status">当选</text> -->
-                                    <text class="status un">未当选</text>
+                                    <text>{{ v.name }}</text>
+                                    <text class="status" v-if="v.vote_result == 1">当选</text>
+                                    <text class="status un" v-else>未当选</text>
                                 </view>
-                                <view class="votes">得票数：286</view>
+                                <view class="votes">得票数：{{ v.agree_num }}</view>
                             </view>
 
                             <view class="progress">
-                                <u-line-progress :percentage="60" height="8rpx" active-color="#2563EB" :show-text="false" />
-                                <view class="progress-text">60%</view>
+                                <u-line-progress :percentage="v.ageree_percent" height="8rpx" active-color="#2563EB" :show-text="false" />
+                                <view class="progress-text">{{ v.ageree_percent }}%</view>
                             </view>
                         </view>
 
-                        <view class="info-bts" @click.stop="navto('pages/electionList/info')">查看投票详情</view>
+                        <view class="info-bts" @click.stop="navto('pages/electionList/info', { id: row.id })">查看投票详情</view>
                     </view>
                 </view>
             </template>
diff --git a/src/pages/myElection/index.vue b/src/pages/myElection/index.vue
index 5cee356..4a81ddc 100644
--- a/src/pages/myElection/index.vue
+++ b/src/pages/myElection/index.vue
@@ -101,52 +101,42 @@ const choiceText = (choice) => {
     )
 }
 
-	const choiceText = (choice) => {
-		return ({
-			1: '同意',
-			0: '反对',
-			2: '弃权'
-		} [choice] || '')
-	}
-	
-	// 获取数据
-	const getList = async () => {
-	  try {
-	    loading.value = true
-	    
-	    // 模拟接口请求（替换为你的真实接口）
-	    const mockData = await getMyvote().then((res)=> {
-			
-		})
-	    
-	    // 处理数据
-	    dataList.value = [...dataList.value, ...mockData]
-	    
-	    // 判断是否还有数据
-	    noMoreData.value = mockData.length < pageSize.value
-	  } finally {
-	    loading.value = false
-	  }
-	}
-	
-	// 加载更多
-	const loadMore = () => {
-	  if (loading.value || noMoreData.value) return
-	  page.value += 1
-	  getList()
-	}
-	
-	onMounted(() => {
-	  getList()
-	})
-	
-	onShow(() => {
-	    if (userStore.mobile) {
-	        uni.navigateTo({
-	            url: '/pages/login/login'
-	        });
-	    }
-	})
+// 获取数据
+const getList = async () => {
+    try {
+        loading.value = true
+
+        // 模拟接口请求（替换为你的真实接口）
+        const mockData = await getMyvote()
+
+        // 处理数据
+        dataList.value = [...dataList.value, ...mockData]
+
+        // 判断是否还有数据
+        noMoreData.value = mockData.length < pageSize.value
+    } finally {
+        loading.value = false
+    }
+}
+
+// 加载更多
+const loadMore = () => {
+    if (loading.value || noMoreData.value) return
+    page.value += 1
+    getList()
+}
+
+onMounted(() => {
+    getList()
+})
+
+onShow(() => {
+    if (userStore.mobile) {
+        uni.navigateTo({
+            url: '/pages/login/login'
+        })
+    }
+})
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/votingElection/index.vue b/src/pages/votingElection/index.vue
index c1efa81..4fce0a5 100644
--- a/src/pages/votingElection/index.vue
+++ b/src/pages/votingElection/index.vue
@@ -30,6 +30,7 @@ const buttlist = ref([
         butname: '弃权'
     }
 ])
+
 const params = ref([])
 const selectBut = (data: any, cardid: any, type: string, butname: string) => {
     if (cardid) {
@@ -72,95 +73,37 @@ const allChange = () => {
     })
 }
 
-	const buttlist = ref([
-		{
-			type: '1',
-			butname: '同意'
-		},
-		{
-			type: '2',
-			butname: '反对'
-		},
-		{
-			type: '3',
-			butname: '弃权'
-		}
-	])
-	const params = ref([])
-	const selectBut = (data : any, cardid : any, type : string, butname : string) => {
-		if (cardid) {
-			const target = data.find((card : { id : any }) => card.id === cardid)
-			uni.showModal({
-				title: '您本轮选举投' + butname + '票',
-				content: '确定吗？',
-				success: function (res) {
-					if (res.confirm) {
-						if (target) {
-							target.vote_result = type
-						}
-					} else if (res.cancel) {
-						console.log('用户点击取消')
-					}
-				}
-			})
-			params.value.push(target)
-		} else {
-			data.forEach((ele : {
-				vote_result : number; id : any;
-			}) => {
-				ele.vote_result = 1
-			})
-		}
-	}
-	const allChange = () => {
-		uni.showModal({
-			title: '您本轮选举全投同意票',
-			content: '确定吗？',
-			success: function (res) {
-				if (res.confirm) {
-					xjList.value.data?.forEach((ele : { vote_result : number; }) => {
-						ele.vote_result = 1
-					})
-					params.value = xjList.value.data
-					submit()
-				} else if (res.cancel) {
-					console.log('用户点击取消')
-				}
-			}
-		})
-	}
-	
-	function extractTwoProps(arr:any, key1:string, key2:string) {
-	  return arr.map(({ [key1]: prop1, [key2]: prop2 }) => ({
-	    [key1]: prop1,
-	    [key2]: prop2
-	  }));
-	}
-	const submit = () => {
-		let param = {
-			openid: userStore.openId,
-			id: xjList.value.id,
-			candidate: JSON.stringify(extractTwoProps(params.value,'id','vote_result'))
-		}
-		if(param.candidate === '[]') {
-			uni.showToast({
-			    title: '未选举',
-			    icon: 'none', // 可选，图标类型，'success', 'loading', 'none'
-			    duration: 1500 // 持续时长，单位ms
-			});
-		} else {
-			voteMember(param).then((res)=> {
-				console.log(res,555555555555555)
-			})
-		}
-	}
-	onShow(() => {
-	    if (userStore.mobile) {
-	        uni.navigateTo({
-	            url: '/pages/login/login'
-	        });
-	    }
-	})
+function extractTwoProps(arr: any, key1: string, key2: string) {
+    return arr.map(({ [key1]: prop1, [key2]: prop2 }) => ({
+        [key1]: prop1,
+        [key2]: prop2
+    }))
+}
+const submit = () => {
+    let param = {
+        openid: userStore.openId,
+        id: xjList.value.id,
+        candidate: JSON.stringify(extractTwoProps(params.value, 'id', 'vote_result'))
+    }
+    if (param.candidate === '[]') {
+        uni.showToast({
+            title: '未选举',
+            icon: 'none', // 可选，图标类型，'success', 'loading', 'none'
+            duration: 1500 // 持续时长，单位ms
+        })
+    } else {
+        voteMember(param).then((res) => {
+            console.log(res, 555555555555555)
+        })
+    }
+}
+onShow(() => {
+    if (userStore.mobile) {
+        uni.navigateTo({
+            url: '/pages/login/login'
+        })
+    }
+})
 </script>
 
 <template>