From 04520c1869ac7a3c6bc59a50d13cb645e1a3971c Mon Sep 17 00:00:00 2001
From: yuepenglong <1547476325@qq.com>
Date: Thu, 10 Apr 2025 18:14:15 +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/login.ts                   |  8 +++++
 src/api/votingElection.ts          | 11 ++++++-
 src/pages/login/login.vue          | 26 ++++++++--------
 src/pages/votingElection/index.vue | 48 +++++++++++++++++++-----------
 4 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/src/api/login.ts b/src/api/login.ts
index 92c221b..7cbc236 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -20,3 +20,11 @@ export function getAdminPhone() {
         method: 'GET'
     })
 }
+//用户签到
+export function getSign(data: { meetId: string; openid: string }) {
+    return request.http({
+        url: '/api/sign',
+        method: 'GET',
+		data
+    })
+}
diff --git a/src/api/votingElection.ts b/src/api/votingElection.ts
index 72e9ddb..9fb86e6 100644
--- a/src/api/votingElection.ts
+++ b/src/api/votingElection.ts
@@ -1,7 +1,7 @@
 import { request } from '@/utils/http'
 
 // 获取投票选举（正在进行）
-export function getVoteprogress(id: number) {
+export function getVoteprogress(id: string) {
     return request.http({
         url: '/api/vote_progress?meetId='+ id,
         method: 'GET'
@@ -33,3 +33,12 @@ export function getMember_mobile(data: any) {
         data
     })
 }
+
+// 判断用户是否签到
+export function getIs_sign(data: any) {
+    return request.http({
+        url: '/api/is_sign',
+        method: 'GET',
+        data
+    })
+}
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index a53e9b6..eecc0d6 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { debounce } from 'feng-uniapp-exploit/utils/index'
-import { getMobile } from '@/api/login'
+import { getMobile, getSign } from '@/api/login'
 
 import useUserStore from '@/store/user'
 const userStore = useUserStore()
@@ -57,19 +57,21 @@ const onGetPhoneNumber = debounce(async (e: phoneEvent) => {
     }
 })
 
-const meetid = ref(0)
+const meetid = ref('')
 
 const onLoginSuccess = () => {
-    uni.showToast({
-        title: '登录成功',
-        icon: 'none',
-        success: () => {
-            setTimeout(() => {
-                userStore.showtoast = false
-                uni.reLaunch({ url: '/pages/votingElection/index?meetId='+ meetid.value })
-            }, 1000)
-        }
-    })
+		uni.showToast({
+			title: '登录成功',
+			icon: 'none',
+			success: () => {
+				setTimeout(() => {
+					userStore.showtoast = false
+					uni.reLaunch({ url: '/pages/votingElection/index?meetId='+ meetid.value })
+				}, 1000)
+			}
+		})
+		getSign({openid: userStore.openId, meetId: meetid.value})
+		
 }
 onLoad((options: any) => {
 	console.log('扫码参数1:', options);
diff --git a/src/pages/votingElection/index.vue b/src/pages/votingElection/index.vue
index 0a3d4da..21186c8 100644
--- a/src/pages/votingElection/index.vue
+++ b/src/pages/votingElection/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { getVoteprogress, voteMember, getMember_mobile } from '../../api/votingElection'
+import { getVoteprogress, voteMember, getMember_mobile, getIs_sign } from '../../api/votingElection'
 import useUserStore from '@/store/user'
 import { isEmptyObject } from '@/utils/common'
 
@@ -11,7 +11,7 @@ const reListRef = ref()
 
 const xjList = ref<any>({})
 
-const meetid = ref(0)
+const meetid = ref('')
 
 
 
@@ -19,28 +19,42 @@ onLoad((options: any) => {
 	console.log('扫码2:', options);
 	if(options.meetId){
 		meetid.value = options.meetId
-		let params = {
-			mobile: userStore.mobile,
-			openid: userStore.openId,
-			meetId: options.meetId
-		}
-		getMember_mobile(params)
+		// let params = {
+		// 	mobile: userStore.mobile,
+		// 	openid: userStore.openId,
+		// 	meetId: options.meetId
+		// }
+		// getMember_mobile(params)
 	}
 	
 })
 
 const doSearch = (_formData: { page: number; limit: number }, onSuccess: Function) => {
 	setTimeout(()=> {
-		getVoteprogress(meetid.value).then((res) => {
-			const { data } = res as { data: { candidate: any[] } }
-			xjList.value = data || {}
-			onSuccess({
-				data: {
-					data: data.candidate || [],
-					total: (data.candidate || []).length
-				}
+			getVoteprogress(meetid.value).then((res) => {
+				const { data } = res as { data: { candidate: any[] } }
+				xjList.value = data || {}
+				onSuccess({
+					data: {
+						data: data.candidate || [],
+						total: (data.candidate || []).length
+					}
+				})
 			})
-		})
+			// getIs_sign({openid: userStore.openId, meetId: meetid.value}).then((res: any)=> {
+			// 	if(res.code === 0) {
+			// 		uni.showToast({
+			// 			title: '请扫码签到',
+			// 			icon: 'none',
+			// 			success: () => {
+			// 				setTimeout(() => {
+			// 					uni.reLaunch({ url: '/pages/login/login' })
+			// 				}, 500)
+			// 			}
+			// 		})
+			// 	} else {
+			// 	}
+			// })
 	},1000)
 }