diff --git a/src/api/votingElection.ts b/src/api/votingElection.ts index dc80f82..269e9e3 100644 --- a/src/api/votingElection.ts +++ b/src/api/votingElection.ts @@ -1,12 +1,10 @@ import { request } from '@/utils/http' - - // 获取投票选举(正在进行) export function getVoteprogress() { return request.http({ url: '/api/vote_progress', - method: "GET" + method: 'GET' }) } @@ -19,11 +17,10 @@ export function voteMember(data: any) { } // 获取我的选举 -export function getMyvote(data:any) { +export function getMyvote(data: any) { return request.http({ url: '/api/my_vote', - method: "GET", - data - + method: 'GET', + data }) -} \ No newline at end of file +} diff --git a/src/components/ex-tags/ex-tags.vue b/src/components/ex-tags/ex-tags.vue deleted file mode 100644 index 119e414..0000000 --- a/src/components/ex-tags/ex-tags.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - - - diff --git a/src/pages/mine/add.vue b/src/pages/mine/add.vue index fc58bd7..b017f89 100644 --- a/src/pages/mine/add.vue +++ b/src/pages/mine/add.vue @@ -31,7 +31,9 @@ const onSubmit = uni.$util.debounce(() => { addAPi(formData).then(() => { uni.hideLoading() - uni.switchTab({ url: '/pages/mine/index' }) + uni.showToast({ title: '签到成功,等待投票!', icon: 'none' }) + + setTimeout(() => uni.switchTab({ url: '/pages/mine/index' }), 1000) }) } }) diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue index 8615d16..39b7a44 100644 --- a/src/pages/mine/index.vue +++ b/src/pages/mine/index.vue @@ -38,7 +38,7 @@ const updateUserInfo = () => { userStore.bindUser(list.value[activeKey.value].id as number).then(() => { reset() userStore.getUserInfo() - uni.showToast({ title: '绑定成功', icon: 'none' }) + uni.showToast({ title: '签到成功,等待投票!', icon: 'none' }) }) } @@ -79,7 +79,6 @@ const save = () => { onShow(() => { reset() - getAdminPhone().then((res) => { const { data } = res as { data: string } amdinPhone.value = data || '' diff --git a/src/pages/myElection/index.vue b/src/pages/myElection/index.vue index d85fd15..1815e69 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.vote_title == 1 ? '未开始' : item.vote_title == 2 ? '进行中' : '已结束' }} @@ -34,7 +34,7 @@ {{ candidate.position }} - + 我的选择: {{ choiceText(candidate.vote_result) }} @@ -108,18 +108,18 @@ const getList = async () => { try { loading.value = true - let param = { - openid: userStore.openId, - page: page.value, - limit: pageSize.value - } + let param = { + openid: userStore.openId, + page: page.value, + limit: pageSize.value + } // 模拟接口请求(替换为你的真实接口) const mockData = await getMyvote(param) - // 处理数据 - electionList.value = [...electionList.value, ...mockData.data.data] - // electionList.value.push(mockData) - + // 处理数据 + electionList.value = [...electionList.value, ...mockData.data.data] + // electionList.value.push(mockData) + // 判断是否还有数据 noMoreData.value = mockData.data.data.length < pageSize.value } finally { @@ -137,7 +137,6 @@ const loadMore = () => { onShow(() => { getList() }) - \ No newline at end of file + + + + + diff --git a/src/store/user.ts b/src/store/user.ts index 7aa721a..b7cfb50 100644 --- a/src/store/user.ts +++ b/src/store/user.ts @@ -36,7 +36,7 @@ export default defineStore( .then((res) => { const { data } = res as { data: userInfoStoreInt } - userInfo.value = data + userInfo.value = data || {} resolve({ code: 1, data, message: 'SUCCESS' }) })