From e57a0efbf13df9e17537be564c03e5739e675eb3 Mon Sep 17 00:00:00 2001
From: Hx <2294602187@qq.com>
Date: Wed, 2 Apr 2025 10:06:29 +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/user.ts                    |  5 +++--
 src/pages/electionList/index.vue   | 17 ++---------------
 src/pages/login/login.vue          | 15 +++++++++++----
 src/pages/mine/index.vue           | 25 ++++++++++++++++++++++---
 src/pages/myElection/index.vue     |  2 +-
 src/pages/votingElection/index.vue | 21 ++++++++++++++-------
 src/store/user.ts                  |  3 +--
 src/utils/common.ts                | 13 +++++++++++++
 8 files changed, 67 insertions(+), 34 deletions(-)

diff --git a/src/api/user.ts b/src/api/user.ts
index d348453..8f64218 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -14,13 +14,14 @@ export interface dateListtype extends listType {
     id: number
 }
 
-export function infoForOpenid(data: { openid: string }) {
+export function infoForOpenid(data: { openid: string; mobile: string }) {
     return request.http({
-        url: '/api/member',
+        url: '/api/member_mobile',
         method: 'GET',
         data
     })
 }
+
 export function list(data: { name: string }) {
     return request.http({
         url: '/api/member_name',
diff --git a/src/pages/electionList/index.vue b/src/pages/electionList/index.vue
index 43c7565..7c196f4 100644
--- a/src/pages/electionList/index.vue
+++ b/src/pages/electionList/index.vue
@@ -9,19 +9,6 @@ const doSearch = (formData: { page: number; limit: number }, onSuccess: Function
         onSuccess({ data })
     })
 }
-
-const setInerval = ref<any>()
-
-onShow(() => {
-    setInerval.value = setInterval(() => {
-        reListRef.value.refreshFn()
-    }, 5000)
-})
-
-onHide(() => {
-    clearInterval(setInerval.value)
-    setInerval.value = null
-})
 </script>
 
 <template>
@@ -60,8 +47,8 @@ onHide(() => {
                             </view>
 
                             <view class="progress">
-                                <u-line-progress :percentage="v.ageree_percent" height="8rpx" active-color="#2563EB" :show-text="false" />
-                                <view class="progress-text">{{ v.ageree_percent }}%</view>
+                                <u-line-progress :percentage="v.agree_percent" height="8rpx" active-color="#2563EB" :show-text="false" />
+                                <view class="progress-text">{{ v.agree_percent }}%</view>
                             </view>
                         </view>
 
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 2577394..eb6b248 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -39,12 +39,19 @@ const onGetPhoneNumber = debounce(async (e: phoneEvent) => {
             await userStore.getopenid({ code: loginCode.value })
         }
 
-        const { data: phone } = (await getMobile({ openid: userStore.openId, code: e.detail.code })) as { data: string }
-        userStore.mobile = phone
+        getMobile({ openid: userStore.openId, code: e.detail.code })
+            .then((res) => {
+                const { data: phone } = res as { data: string }
 
-        userStore.getUserInfo()
+                userStore.mobile = phone
 
-        onLoginSuccess()
+                userStore.getUserInfo()
+
+                onLoginSuccess()
+            })
+            .catch(() => {
+                uni.showToast({ title: '登录失败！', icon: 'none' })
+            })
     } catch (error) {
         uni.showToast({ title: '登录失败', icon: 'none' })
     }
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index 39b7a44..e5fe59c 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -71,8 +71,8 @@ const save = () => {
     uni.showLoading({ mask: true, title: '保存中...' })
 
     updateApi({ [popFrom.key]: popFrom.value }, userStore.openId).then(() => {
-        userStore.userInfo[popFrom.key] = popFrom.value
         uni.hideLoading()
+        userStore.userInfo[popFrom.key] = popFrom.value
         showEdit.value = false
     })
 }
@@ -84,6 +84,8 @@ onShow(() => {
         amdinPhone.value = data || ''
     })
 })
+
+onPullDownRefresh(() => userStore.getUserInfo())
 </script>
 <template>
     <view class="userview">
@@ -187,7 +189,14 @@ onShow(() => {
         <u-popup :show="showEdit" mode="center" @close="showEdit = false" :round="10">
             <view class="popupView">
                 <view class="title">修改{{ popFrom.label }}</view>
-                <u-input :placeholder="`请输入${popFrom.label}`" input-align="right" v-model="popFrom.value">
+                <view v-if="popFrom.key === 'sex'" class="flex-center-between sexview">
+                    <text>性别</text>
+                    <u-radio-group v-model="popFrom.value" placement="row">
+                        <u-radio shape="circle" label="男" :name="1" />
+                        <u-radio shape="circle" label="女" :name="2" />
+                    </u-radio-group>
+                </view>
+                <u-input v-else :placeholder="`请输入${popFrom.label}`" input-align="right" v-model="popFrom.value">
                     <template v-slot:prefix>
                         <text style="color: #909399">{{ popFrom.label }}</text>
                     </template>
@@ -209,7 +218,7 @@ onShow(() => {
 
     .popupView {
         width: 90vw;
-        padding: 20rpx 40rpx 0;
+        padding: 20rpx 40rpx;
 
         .title {
             font-size: 36rpx;
@@ -217,9 +226,19 @@ onShow(() => {
             margin-bottom: 40rpx;
         }
 
+        :deep(.u-input) {
+            border-width: 2rpx !important;
+        }
+
         .bts {
             margin-top: 40rpx;
         }
+
+        .sexview {
+            :deep(.u-radio-group) {
+                justify-content: flex-end !important;
+            }
+        }
     }
 
     .box {
diff --git a/src/pages/myElection/index.vue b/src/pages/myElection/index.vue
index b552dd2..21a181a 100644
--- a/src/pages/myElection/index.vue
+++ b/src/pages/myElection/index.vue
@@ -15,7 +15,7 @@
                                       : 'background: #F3F4F6;color: #4B5563'
                             "
                         >
-                            {{ item.vote_title == 1 ? '未开始' : item.vote_title == 2 ? '进行中' : '已结束' }}
+                            {{ item.status == 1 ? '未开始' : item.status == 2 ? '进行中' : '已结束' }}
                         </view>
                     </view>
                 </view>
diff --git a/src/pages/votingElection/index.vue b/src/pages/votingElection/index.vue
index 59bb83d..eb2ece5 100644
--- a/src/pages/votingElection/index.vue
+++ b/src/pages/votingElection/index.vue
@@ -1,10 +1,14 @@
 <script setup lang="ts">
 import { getVoteprogress, voteMember } from '../../api/votingElection'
 import useUserStore from '@/store/user'
+import { isEmptyObject } from '@/utils/common'
+
 const userStore = useUserStore()
 
 const showDialogRef = ref()
 
+const reListRef = ref()
+
 const xjList = ref<any>({})
 
 const doSearch = (_formData: { page: number; limit: number }, onSuccess: Function) => {
@@ -100,12 +104,6 @@ const submit = () => {
     }
 }
 
-const isEmptyObject = (obj: any) => {
-    if (obj == null) return true
-    if (typeof obj !== 'object' || Array.isArray(obj)) return true
-    return Reflect.ownKeys(obj).length === 0
-}
-
 const onConfirm = () => uni.reLaunch({ url: '/pages/mine/index' })
 
 onShow(() => {
@@ -116,6 +114,15 @@ onShow(() => {
             })
         } else if (isEmptyObject(userStore.userInfo)) {
             showDialogRef.value.show = true
+        } else {
+            uni.showToast({
+                title: '签到成功，等待投票！',
+                icon: 'success',
+                duration: 1000,
+                complete: () => {
+                    setTimeout(() => reListRef.value.refreshFn(), 1100)
+                }
+            })
         }
     })
 })
@@ -129,7 +136,7 @@ onShow(() => {
             <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">
+        <ex-list ref="reListRef" custom-list-type="custom" :on-form-search="doSearch" :is-perform-search="false">
             <template v-slot="{ data }">
                 <view class="tppart">
                     <view class="tpone" v-for="(row, index) of data" :key="'tpone' + index">
diff --git a/src/store/user.ts b/src/store/user.ts
index b7cfb50..9e33664 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -32,12 +32,11 @@ export default defineStore(
 
         function getUserInfo() {
             return new Promise<any>((resolve, reject) => {
-                infoForOpenid({ openid: openId.value })
+                infoForOpenid({ openid: openId.value, mobile: mobile.value })
                     .then((res) => {
                         const { data } = res as { data: userInfoStoreInt }
 
                         userInfo.value = data || {}
-
                         resolve({ code: 1, data, message: 'SUCCESS' })
                     })
                     .catch((err) => {
diff --git a/src/utils/common.ts b/src/utils/common.ts
index ee62fac..a0e0a09 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -43,3 +43,16 @@ export const fileUrl = (fileName: string, filePath: string = 'images'): string =
         return `http://cdn-pos.lingji.vip/static/${filePath}/${fileName}`
     }
 }
+
+/**
+ * 判断对象是否为空
+ * @author shenname <shenname@163.com>
+ * @license MIT
+ * @param any
+ * @returns {boolean}
+ */
+export const isEmptyObject = (obj: any): boolean => {
+    if (obj == null) return true
+    if (typeof obj !== 'object' || Array.isArray(obj)) return true
+    return Reflect.ownKeys(obj).length === 0
+}