From 63d248f2272f3f94142c4dbaf3911e22c78a3e68 Mon Sep 17 00:00:00 2001
From: yuepenglong <1547476325@qq.com>
Date: Fri, 28 Mar 2025 20:35:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/votingElection.ts          |  12 +-
 src/pages/myElection/index.vue     |  18 +-
 src/pages/votingElection/index.vue | 784 +++++++++++++++--------------
 src/static/img/Group.png           | Bin 0 -> 4474 bytes
 4 files changed, 420 insertions(+), 394 deletions(-)
 create mode 100644 src/static/img/Group.png

diff --git a/src/api/votingElection.ts b/src/api/votingElection.ts
index e8933b7..dc80f82 100644
--- a/src/api/votingElection.ts
+++ b/src/api/votingElection.ts
@@ -1,10 +1,12 @@
 import { request } from '@/utils/http'
 
+
+
 // 获取投票选举（正在进行）
 export function getVoteprogress() {
     return request.http({
         url: '/api/vote_progress',
-        method: 'GET'
+		method: "GET"
     })
 }
 
@@ -17,9 +19,11 @@ export function voteMember(data: any) {
 }
 
 // 获取我的选举
-export function getMyvote() {
+export function getMyvote(data:any) {
     return request.http({
         url: '/api/my_vote',
-        method: 'GET'
+		method: "GET",
+		data
+		
     })
-}
+}
\ No newline at end of file
diff --git a/src/pages/myElection/index.vue b/src/pages/myElection/index.vue
index 4a81ddc..266a54c 100644
--- a/src/pages/myElection/index.vue
+++ b/src/pages/myElection/index.vue
@@ -55,6 +55,8 @@
 <script setup>
 import { ref, watch } from 'vue'
 import { getMyvote } from '../../api/votingElection'
+import useUserStore from '@/store/user'
+	const userStore = useUserStore()
 
 const electionList = ref([])
 const page = ref(1)
@@ -106,12 +108,20 @@ const getList = async () => {
     try {
         loading.value = true
 
+		let param = {
+			openid: userStore.openId,
+			page: page.value,
+			limit: pageSize.value
+		}
+		console.log(param,5555555555);
         // 模拟接口请求（替换为你的真实接口）
-        const mockData = await getMyvote()
-
-        // 处理数据
-        dataList.value = [...dataList.value, ...mockData]
+        const mockData = await getMyvote(param).then((res)=> {
+			console.log(res,66666666666);
+		})
 
+		// 处理数据
+		electionList.value = [...electionList.value, ...mockData]
+			
         // 判断是否还有数据
         noMoreData.value = mockData.length < pageSize.value
     } finally {
diff --git a/src/pages/votingElection/index.vue b/src/pages/votingElection/index.vue
index 4fce0a5..d3cd582 100644
--- a/src/pages/votingElection/index.vue
+++ b/src/pages/votingElection/index.vue
@@ -1,386 +1,398 @@
-<script setup lang="ts">
-import { getVoteprogress, voteMember } from '../../api/votingElection'
-import useUserStore from '@/store/user'
-const userStore = useUserStore()
-
-const xjList = ref({})
-const doSearch = (_formData: { page: number; limit: number }, onSuccess: Function) => {
-    getVoteprogress().then((res) => {
-        xjList.value = res.data
-        res.data.data = res.data.candidate
-        // 2. 删除旧属性名
-        delete res.data.candidate
-        res.data.total = res.data.candidate?.length
-        const { data } = res as { data: { data: any; total: number } }
-        onSuccess({ data })
-    })
-}
-
-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'
-        })
-    }
-})
-</script>
-
-<template>
-    <!-- 你的页面内容 -->
-    <view class="box">
-        <view class="headpart">
-            <view class="title">{{ xjList.title }}</view>
-            <view class="time">投票开始时间：{{ xjList.start_time }}</view>
-            <view class="time">投票截止时间：{{ xjList.end_time }}</view>
-        </view>
-        <ex-list ref="reListRef" custom-list-type="custom" :on-form-search="doSearch">
-            <template v-slot="{ data }">
-                <view class="tppart">
-                    <view class="tpone" v-for="(row, index) of data" :key="'tpone' + index">
-                        <view class="topp">
-                            <img style="width: 96rpx; height: 96rpx; border-radius: 50%" :src="row.photo" alt="" />
-                            <view class="rightpart">
-                                <view class="name">
-                                    {{ row.name }}
-                                </view>
-                                <view class="class">
-                                    {{ row.position }}
-                                </view>
-                            </view>
-                        </view>
-                        <view class="bottomp">
-                            <view
-                                class="minbut"
-                                v-for="(item, ele) in buttlist"
-                                :key="ele"
-                                @click="selectBut(data, row.id, item.type, item.butname)"
-                                :class="{ active: row.vote_result === item.type }"
-                            >
-                                {{ item.butname }}
-                            </view>
-                        </view>
-                    </view>
-                </view>
-            </template>
-        </ex-list>
-        <view class="bottbutton">
-            <view class="qbty" @click="allChange">全部同意</view>
-            <view class="tjtp" @click="submit">提交投票</view>
-        </view>
-    </view>
-</template>
-
-<style scoped lang="scss">
-.box {
-    width: 100%;
-    background-color: #f9fafb;
-
-    .headpart {
-        width: 92%;
-        height: 194rpx;
-        border-radius: 24rpx;
-        background-color: #eff6ff;
-        margin: 32rpx auto;
-        padding: 20rpx 3%;
-
-        .title {
-            color: #2563eb;
-            font-size: 28rpx;
-            margin-top: 16rpx;
-        }
-
-        .time {
-            margin-top: 16rpx;
-            color: #4b5563;
-            font-size: 28rpx;
-        }
-    }
-
-    .tppart {
-        width: 100%;
-        max-height: 69vh;
-        overflow-y: auto;
-        display: grid;
-        justify-items: center;
-
-        .tpone {
-            width: 91%;
-            height: 264rpx;
-            padding: 20rpx 4%;
-            box-sizing: border-box;
-            border-radius: 24rpx;
-            background: linear-gradient(0deg, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.001)), #ffffff;
-            box-sizing: border-box;
-            border: 2rpx solid #f3f4f6;
-            box-shadow:
-                0rpx 2rpx 4rpx -2rpx rgba(0, 0, 0, 0.1),
-                0rpx 2rpx 6rpx 0rpx rgba(0, 0, 0, 0.1);
-            margin-top: 32rpx;
-            display: grid;
-
-            .topp {
-                display: flex;
-
-                .rightpart {
-                    margin-left: 32rpx;
-                    display: grid;
-                    justify-items: left;
-                    align-content: baseline;
-
-                    .name {
-                        font-family: Roboto;
-                        font-size: 28rpx;
-                        font-weight: 500;
-                        line-height: 42rpx;
-                        letter-spacing: normal;
-                        color: #000000;
-                        margin-top: 7rpx;
-                    }
-
-                    .class {
-                        font-family: Roboto;
-                        font-size: 28rpx;
-                        font-weight: normal;
-                        line-height: 40rpx;
-                        letter-spacing: normal;
-                        color: #6b7280;
-                        margin-top: 7rpx;
-                    }
-                }
-            }
-
-            .bottomp {
-                display: flex;
-                justify-content: space-between;
-                gap: 0rpx 20rpx;
-
-                .minbut {
-                    flex: 1;
-                    width: 190rpx;
-                    height: 76rpx;
-                    /* 自动布局 */
-                    display: flex;
-                    justify-content: center;
-                    padding: 16rpx 32rpx;
-                    flex-wrap: wrap;
-                    align-content: flex-start;
-                    border-radius: 8rpx;
-                    background: #ffffff;
-                    box-sizing: border-box;
-                    border: 2rpx solid #d1d5db;
-                    font-family: Roboto;
-                    font-size: 28rpx;
-                    font-weight: normal;
-                    line-height: 40rpx;
-                    text-align: center;
-                    letter-spacing: normal;
-                    color: #4b5563;
-                }
-
-                .minbut.active {
-                    border: 2rpx solid #2563eb;
-                    color: #2563eb;
-                }
-            }
-        }
-
-        .tpone:first-child {
-            margin-top: 0;
-        }
-    }
-
-    .bottbutton {
-        width: 100%;
-        height: 10vh;
-        display: flex;
-        padding: 24rpx 32rpx;
-        gap: 0rpx 24rpx;
-        flex-wrap: wrap;
-        align-content: flex-start;
-        background: #ffffff;
-        box-sizing: border-box;
-        border-width: 2rpx 0rpx 0rpx 0rpx;
-        border-style: solid;
-        border-color: #f3f4f6;
-        position: fixed;
-        bottom: 0;
-
-        .qbty {
-            width: 331rpx;
-            height: 90rpx;
-            /* 自动布局 */
-            display: flex;
-            box-sizing: border-box;
-            justify-content: center;
-            padding: 24rpx 0rpx;
-            gap: 0rpx 20rpx;
-            flex-wrap: wrap;
-            border-radius: 8rpx;
-            background: #eff6ff;
-            font-family: Roboto;
-            font-size: 28rpx;
-            font-weight: 500;
-            line-height: 42rpx;
-            text-align: center;
-            letter-spacing: normal;
-            color: #2563eb;
-        }
-
-        .tjtp {
-            width: 331rpx;
-            height: 90rpx;
-            /* 自动布局 */
-            display: flex;
-            box-sizing: border-box;
-            justify-content: center;
-            padding: 24rpx 0rpx;
-            gap: 0rpx 20rpx;
-            flex-wrap: wrap;
-            border-radius: 8rpx;
-            background: #2563eb;
-            font-family: Roboto;
-            font-size: 28rpx;
-            font-weight: 500;
-            line-height: 42rpx;
-            text-align: center;
-            letter-spacing: normal;
-            color: #ffffff;
-        }
-    }
-
-    .address-items {
-        padding: 20rpx 15rpx 32rpx 28rpx;
-        background-color: #fff;
-        border-bottom: 2rpx solid #f5f5f5;
-
-        .left {
-            flex: 1;
-            overflow: hidden;
-
-            .name {
-                font-size: 28rpx;
-                font-weight: 700;
-                color: #101010;
-                line-height: 40rpx;
-                margin-right: 16rpx;
-            }
-
-            .isdefault {
-                font-size: 20rpx;
-                font-weight: 400;
-                color: #fff;
-                padding: 4rpx 12rpx;
-                border-radius: 8rpx;
-                background: linear-gradient(90deg, #4778ff 0%, #4778ffb8 100%);
-            }
-
-            .info {
-                width: 100%;
-                color: #666;
-                font-size: 24rpx;
-                font-weight: 400;
-                margin-top: 12rpx;
-            }
-        }
-
-        .right {
-            width: 140rpx;
-            padding-left: 32rpx;
-            font-size: 24rpx;
-            font-weight: 400;
-            color: #4979ff;
-            text-align: right;
-        }
-    }
-
-    .buts {
-        width: 100%;
-        height: 10vh;
-        background-color: F3F4F6;
-        position: fixed;
-        bottom: 0;
-        border-top: 2rpx solid #ebebec;
-    }
-}
-</style>
+<script setup lang="ts">
+	import { getVoteprogress, voteMember } from '../../api/votingElection'
+	import useUserStore from '@/store/user'
+	const userStore = useUserStore()
+
+	const xjList = ref<any>({})
+
+	const doSearch = (_formData : { page : number; limit : number }, onSuccess : Function) => {
+		getVoteprogress().then((res) => {
+			const { data } = res as { data : { candidate : any[] } }
+			xjList.value = data || {}
+			onSuccess({

+				data: {
+					data: data.candidate || [],
+					total: (data.candidate || []).length
+				}

+			})
+		})
+	}
+
+	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'
+			})
+		}
+	})
+</script>
+
+<template>
+	<!-- 你的页面内容 -->
+	<view class="box" v-if="xjList.length != 0">
+		<view class="headpart">
+			<view class="title">{{ xjList.title }}</view>
+			<view class="time">投票开始时间：{{ xjList.start_time }}</view>
+			<view class="time">投票截止时间：{{ xjList.end_time }}</view>
+		</view>
+		<ex-list ref="reListRef" custom-list-type="custom" :on-form-search="doSearch">
+			<template v-slot="{ data }">
+				<view class="tppart">
+					<view class="tpone" v-for="(row, index) of data" :key="'tpone' + index">
+						<view class="topp">
+							<img style="width: 96rpx; height: 96rpx; border-radius: 50%" :src="row.photo" alt="" />
+							<view class="rightpart">
+								<view class="name">
+									{{ row.name }}
+								</view>
+								<view class="class">
+									{{ row.position }}
+								</view>
+							</view>
+						</view>
+						<view class="bottomp">
+							<view class="minbut" v-for="(item, ele) in buttlist" :key="ele"
+								@click="selectBut(data, row.id, item.type, item.butname)"
+								:class="{ active: row.vote_result === item.type }">
+								{{ item.butname }}
+							</view>
+						</view>
+					</view>
+				</view>
+			</template>
+		</ex-list>
+		<view class="bottbutton">
+			<view class="qbty" @click="allChange">全部同意</view>
+			<view class="tjtp" @click="submit">提交投票</view>
+		</view>
+	</view>
+	<view style="display: grid;align-items: center;justify-content: center;width: 100%;height: 100vh;align-content: center;" v-else>
+		<img style="width: 188px;height: 140px;" src="@/static/img/Group.png" alt="" />
+		<text class="nodata">
+			暂时没有选举 请刷新重试
+		</text>
+	</view>
+</template>
+
+<style scoped lang="scss">
+	.box {
+		width: 100%;
+		background-color: #f9fafb;
+
+		.headpart {
+			width: 92%;
+			height: 194rpx;
+			border-radius: 24rpx;
+			background-color: #eff6ff;
+			margin: 32rpx auto;
+			padding: 20rpx 3%;
+
+			.title {
+				color: #2563eb;
+				font-size: 28rpx;
+				margin-top: 16rpx;
+			}
+
+			.time {
+				margin-top: 16rpx;
+				color: #4b5563;
+				font-size: 28rpx;
+			}
+		}
+
+		.tppart {
+			width: 100%;
+			max-height: 69vh;
+			overflow-y: auto;
+			display: grid;
+			justify-items: center;
+
+			.tpone {
+				width: 91%;
+				height: 264rpx;
+				padding: 20rpx 4%;
+				box-sizing: border-box;
+				border-radius: 24rpx;
+				background: linear-gradient(0deg, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.001)), #ffffff;
+				box-sizing: border-box;
+				border: 2rpx solid #f3f4f6;
+				box-shadow:
+					0rpx 2rpx 4rpx -2rpx rgba(0, 0, 0, 0.1),
+					0rpx 2rpx 6rpx 0rpx rgba(0, 0, 0, 0.1);
+				margin-top: 32rpx;
+				display: grid;
+
+				.topp {
+					display: flex;
+
+					.rightpart {
+						margin-left: 32rpx;
+						display: grid;
+						justify-items: left;
+						align-content: baseline;
+
+						.name {
+							font-family: Roboto;
+							font-size: 28rpx;
+							font-weight: 500;
+							line-height: 42rpx;
+							letter-spacing: normal;
+							color: #000000;
+							margin-top: 7rpx;
+						}
+
+						.class {
+							font-family: Roboto;
+							font-size: 28rpx;
+							font-weight: normal;
+							line-height: 40rpx;
+							letter-spacing: normal;
+							color: #6b7280;
+							margin-top: 7rpx;
+						}
+					}
+				}
+
+				.bottomp {
+					display: flex;
+					justify-content: space-between;
+					gap: 0rpx 20rpx;
+
+					.minbut {
+						flex: 1;
+						width: 190rpx;
+						height: 76rpx;
+						/* 自动布局 */
+						display: flex;
+						justify-content: center;
+						padding: 16rpx 32rpx;
+						flex-wrap: wrap;
+						align-content: flex-start;
+						border-radius: 8rpx;
+						background: #ffffff;
+						box-sizing: border-box;
+						border: 2rpx solid #d1d5db;
+						font-family: Roboto;
+						font-size: 28rpx;
+						font-weight: normal;
+						line-height: 40rpx;
+						text-align: center;
+						letter-spacing: normal;
+						color: #4b5563;
+					}
+
+					.minbut.active {
+						border: 2rpx solid #2563eb;
+						color: #2563eb;
+					}
+				}
+			}
+
+			.tpone:first-child {
+				margin-top: 0;
+			}
+		}
+
+		.bottbutton {
+			width: 100%;
+			height: 10vh;
+			display: flex;
+			padding: 24rpx 32rpx;
+			gap: 0rpx 24rpx;
+			flex-wrap: wrap;
+			align-content: flex-start;
+			background: #ffffff;
+			box-sizing: border-box;
+			border-width: 2rpx 0rpx 0rpx 0rpx;
+			border-style: solid;
+			border-color: #f3f4f6;
+			position: fixed;
+			bottom: 0;
+
+			.qbty {
+				width: 331rpx;
+				height: 90rpx;
+				/* 自动布局 */
+				display: flex;
+				box-sizing: border-box;
+				justify-content: center;
+				padding: 24rpx 0rpx;
+				gap: 0rpx 20rpx;
+				flex-wrap: wrap;
+				border-radius: 8rpx;
+				background: #eff6ff;
+				font-family: Roboto;
+				font-size: 28rpx;
+				font-weight: 500;
+				line-height: 42rpx;
+				text-align: center;
+				letter-spacing: normal;
+				color: #2563eb;
+			}
+
+			.tjtp {
+				width: 331rpx;
+				height: 90rpx;
+				/* 自动布局 */
+				display: flex;
+				box-sizing: border-box;
+				justify-content: center;
+				padding: 24rpx 0rpx;
+				gap: 0rpx 20rpx;
+				flex-wrap: wrap;
+				border-radius: 8rpx;
+				background: #2563eb;
+				font-family: Roboto;
+				font-size: 28rpx;
+				font-weight: 500;
+				line-height: 42rpx;
+				text-align: center;
+				letter-spacing: normal;
+				color: #ffffff;
+			}
+		}
+
+		.address-items {
+			padding: 20rpx 15rpx 32rpx 28rpx;
+			background-color: #fff;
+			border-bottom: 2rpx solid #f5f5f5;
+
+			.left {
+				flex: 1;
+				overflow: hidden;
+
+				.name {
+					font-size: 28rpx;
+					font-weight: 700;
+					color: #101010;
+					line-height: 40rpx;
+					margin-right: 16rpx;
+				}
+
+				.isdefault {
+					font-size: 20rpx;
+					font-weight: 400;
+					color: #fff;
+					padding: 4rpx 12rpx;
+					border-radius: 8rpx;
+					background: linear-gradient(90deg, #4778ff 0%, #4778ffb8 100%);
+				}
+
+				.info {
+					width: 100%;
+					color: #666;
+					font-size: 24rpx;
+					font-weight: 400;
+					margin-top: 12rpx;
+				}
+			}
+
+			.right {
+				width: 140rpx;
+				padding-left: 32rpx;
+				font-size: 24rpx;
+				font-weight: 400;
+				color: #4979ff;
+				text-align: right;
+			}
+		}
+
+		.buts {
+			width: 100%;
+			height: 10vh;
+			background-color: F3F4F6;
+			position: fixed;
+			bottom: 0;
+			border-top: 2rpx solid #ebebec;
+		}
+	}
+	.nodata {
+		margin-top: 43px;
+		font-family: Source Han Sans;
+		font-size: 18px;
+		font-weight: 500;
+		letter-spacing: normal;
+		color: #34343F;
+	}
+</style>
\ No newline at end of file
diff --git a/src/static/img/Group.png b/src/static/img/Group.png
new file mode 100644
index 0000000000000000000000000000000000000000..848be8ca12b28e4bad1f8504daf33260d62a84d8
GIT binary patch
literal 4474
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
M07*qoM6N<$f<YX7zW@LL

literal 0
HcmV?d00001


From 895de5c83536f88bbce7250571d9f7220b9fc65f Mon Sep 17 00:00:00 2001
From: yuepenglong <1547476325@qq.com>
Date: Sat, 29 Mar 2025 11:11:39 +0800
Subject: [PATCH 2/3] =?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/pages/myElection/index.vue     | 12 ++++++------
 src/pages/votingElection/index.vue |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/myElection/index.vue b/src/pages/myElection/index.vue
index 266a54c..19054dc 100644
--- a/src/pages/myElection/index.vue
+++ b/src/pages/myElection/index.vue
@@ -56,7 +56,7 @@
 import { ref, watch } from 'vue'
 import { getMyvote } from '../../api/votingElection'
 import useUserStore from '@/store/user'
-	const userStore = useUserStore()
+const userStore = useUserStore()
 
 const electionList = ref([])
 const page = ref(1)
@@ -113,17 +113,17 @@ const getList = async () => {
 			page: page.value,
 			limit: pageSize.value
 		}
-		console.log(param,5555555555);
         // 模拟接口请求（替换为你的真实接口）
         const mockData = await getMyvote(param).then((res)=> {
 			console.log(res,66666666666);
 		})
 
 		// 处理数据
-		electionList.value = [...electionList.value, ...mockData]
+		// electionList.value = [...electionList.value, ...mockData]
+		electionList.value.push(mockData)
 			
         // 判断是否还有数据
-        noMoreData.value = mockData.length < pageSize.value
+        // noMoreData.value = mockData.length < pageSize.value
     } finally {
         loading.value = false
     }
@@ -136,12 +136,12 @@ const loadMore = () => {
     getList()
 }
 
-onMounted(() => {
+onShow(() => {
     getList()
 })
 
 onShow(() => {
-    if (userStore.mobile) {
+    if (!userStore.openId) {
         uni.navigateTo({
             url: '/pages/login/login'
         })
diff --git a/src/pages/votingElection/index.vue b/src/pages/votingElection/index.vue
index d3cd582..198ab65 100644
--- a/src/pages/votingElection/index.vue
+++ b/src/pages/votingElection/index.vue
@@ -100,7 +100,7 @@
 		}
 	}
 	onShow(() => {
-		if (userStore.mobile) {
+		if (!userStore.openId) {
 			uni.navigateTo({
 				url: '/pages/login/login'
 			})

From 7952e9bf8d25fb3aee68aafd02b4a5bff0925b86 Mon Sep 17 00:00:00 2001
From: yuepenglong <1547476325@qq.com>
Date: Sat, 29 Mar 2025 11:20:25 +0800
Subject: [PATCH 3/3] =?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/pages/myElection/index.vue     | 7 -------
 src/pages/votingElection/index.vue | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/pages/myElection/index.vue b/src/pages/myElection/index.vue
index 19054dc..093d79c 100644
--- a/src/pages/myElection/index.vue
+++ b/src/pages/myElection/index.vue
@@ -140,13 +140,6 @@ onShow(() => {
     getList()
 })
 
-onShow(() => {
-    if (!userStore.openId) {
-        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 198ab65..0a805d6 100644
--- a/src/pages/votingElection/index.vue
+++ b/src/pages/votingElection/index.vue
@@ -100,7 +100,7 @@
 		}
 	}
 	onShow(() => {
-		if (!userStore.openId) {
+		if (!userStore.mobile) {
 			uni.navigateTo({
 				url: '/pages/login/login'
 			})