yuepenglong
/
Election
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

对接接口

dev
岳鹏龙 1 year ago
parent
d9c6f0ea11
commit
63d248f227
4 changed files with 420 additions and 394 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/api/votingElection.ts
  2. 16
      src/pages/myElection/index.vue
  3. 714
      src/pages/votingElection/index.vue
  4. BIN
      src/static/img/Group.png

10
src/api/votingElection.ts
View File

@ -1,10 +1,12 @@
import { request } from '@/utils/http' import { request } from '@/utils/http'
// 获取投票选举（正在进行） // 获取投票选举（正在进行）
export function getVoteprogress() { export function getVoteprogress() {
return request.http({ return request.http({
url: '/api/vote_progress', 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({ return request.http({
url: '/api/my_vote', url: '/api/my_vote',
method: 'GET' method: "GET",
data
}) })
} }

16
src/pages/myElection/index.vue
View File

@ -55,6 +55,8 @@
<script setup> <script setup>
import { ref, watch } from 'vue' import { ref, watch } from 'vue'
import { getMyvote } from '../../api/votingElection' import { getMyvote } from '../../api/votingElection'
import useUserStore from '@/store/user'
const userStore = useUserStore()
const electionList = ref([]) const electionList = ref([])
const page = ref(1) const page = ref(1)
@ -106,11 +108,19 @@ const getList = async () => {
try { try {
loading.value = true loading.value = true
let param = {
openid: userStore.openId,
page: page.value,
limit: pageSize.value
}
console.log(param,5555555555);
// 模拟接口请求（替换为你的真实接口） // 模拟接口请求（替换为你的真实接口）
const mockData = await getMyvote() const mockData = await getMyvote(param).then((res)=> {
console.log(res,66666666666);
})
// 处理数据 // 处理数据
dataList.value = [...dataList.value, ...mockData] electionList.value = [...electionList.value, ...mockData]
// 判断是否还有数据 // 判断是否还有数据
noMoreData.value = mockData.length < pageSize.value noMoreData.value = mockData.length < pageSize.value

714
src/pages/votingElection/index.vue
View File

@ -1,386 +1,398 @@
<script setup lang="ts"> <script setup lang="ts">
import { getVoteprogress, voteMember } from '../../api/votingElection' import { getVoteprogress, voteMember } from '../../api/votingElection'
import useUserStore from '@/store/user' import useUserStore from '@/store/user'
const userStore = useUserStore() const userStore = useUserStore()
const xjList = ref({}) const xjList = ref<any>({})
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([ const doSearch = (_formData : { page : number; limit : number }, onSuccess : Function) => {
{ getVoteprogress().then((res) => {
type: '1', const { data } = res as { data : { candidate : any[] } }
butname: '同意' xjList.value = data || {}
}, onSuccess({
{ data: {
type: '2', data: data.candidate || [],
butname: '反对' total: (data.candidate || []).length
}, }
{ })
type: '3', })
butname: '弃权' }
}
])
const params = ref([]) const buttlist = ref([
const selectBut = (data: any, cardid: any, type: string, butname: string) => { {
if (cardid) { type: '1',
const target = data.find((card: { id: any }) => card.id === cardid) butname: '同意'
uni.showModal({ },
title: '您本轮选举投' + butname + '票', {
content: '确定吗？', type: '2',
success: function (res) { butname: '反对'
if (res.confirm) { },
if (target) { {
target.vote_result = type type: '3',
} butname: '弃权'
} 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) { const params = ref([])
return arr.map(({ [key1]: prop1, [key2]: prop2 }) => ({ const selectBut = (data : any, cardid : any, type : string, butname : string) => {
[key1]: prop1, if (cardid) {
[key2]: prop2 const target = data.find((card : { id : any }) => card.id === cardid)
})) uni.showModal({
} title: '您本轮选举投' + butname + '票',
const submit = () => { content: '确定吗？',
let param = { success: function (res) {
openid: userStore.openId, if (res.confirm) {
id: xjList.value.id, if (target) {
candidate: JSON.stringify(extractTwoProps(params.value, 'id', 'vote_result')) target.vote_result = type
} }
if (param.candidate === '[]') { } else if (res.cancel) {
uni.showToast({ console.log('用户点击取消')
title: '未选举', }
icon: 'none', // 可选，图标类型，'success', 'loading', 'none' }
duration: 1500 // 持续时长，单位ms })
}) params.value.push(target)
} else { } else {
voteMember(param).then((res) => { data.forEach((ele : { vote_result : number; id : any }) => {
console.log(res, 555555555555555) ele.vote_result = 1
}) })
} }
} }
onShow(() => { const allChange = () => {
if (userStore.mobile) { uni.showModal({
uni.navigateTo({ title: '您本轮选举全投同意票',
url: '/pages/login/login' 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> </script>
<template> <template>
<!-- 你的页面内容 --> <!-- 你的页面内容 -->
<view class="box"> <view class="box" v-if="xjList.length != 0">
<view class="headpart"> <view class="headpart">
<view class="title">{{ xjList.title }}</view> <view class="title">{{ xjList.title }}</view>
<view class="time">投票开始时间：{{ xjList.start_time }}</view> <view class="time">投票开始时间：{{ xjList.start_time }}</view>
<view class="time">投票截止时间：{{ xjList.end_time }}</view> <view class="time">投票截止时间：{{ xjList.end_time }}</view>
</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">
<template v-slot="{ data }"> <template v-slot="{ data }">
<view class="tppart"> <view class="tppart">
<view class="tpone" v-for="(row, index) of data" :key="'tpone' + index"> <view class="tpone" v-for="(row, index) of data" :key="'tpone' + index">
<view class="topp"> <view class="topp">
<img style="width: 96rpx; height: 96rpx; border-radius: 50%" :src="row.photo" alt="" /> <img style="width: 96rpx; height: 96rpx; border-radius: 50%" :src="row.photo" alt="" />
<view class="rightpart"> <view class="rightpart">
<view class="name"> <view class="name">
{{ row.name }} {{ row.name }}
</view> </view>
<view class="class"> <view class="class">
{{ row.position }} {{ row.position }}
</view> </view>
</view> </view>
</view> </view>
<view class="bottomp"> <view class="bottomp">
<view <view class="minbut" v-for="(item, ele) in buttlist" :key="ele"
class="minbut" @click="selectBut(data, row.id, item.type, item.butname)"
v-for="(item, ele) in buttlist" :class="{ active: row.vote_result === item.type }">
:key="ele" {{ item.butname }}
@click="selectBut(data, row.id, item.type, item.butname)" </view>
:class="{ active: row.vote_result === item.type }" </view>
> </view>
{{ item.butname }} </view>
</view> </template>
</view> </ex-list>
</view> <view class="bottbutton">
</view> <view class="qbty" @click="allChange">全部同意</view>
</template> <view class="tjtp" @click="submit">提交投票</view>
</ex-list> </view>
<view class="bottbutton"> </view>
<view class="qbty" @click="allChange">全部同意</view> <view style="display: grid;align-items: center;justify-content: center;width: 100%;height: 100vh;align-content: center;" v-else>
<view class="tjtp" @click="submit">提交投票</view> <img style="width: 188px;height: 140px;" src="@/static/img/Group.png" alt="" />
</view> <text class="nodata">
</view> 暂时没有选举 请刷新重试
</text>
</view>
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">
.box { .box {
width: 100%; width: 100%;
background-color: #f9fafb; background-color: #f9fafb;
.headpart { .headpart {
width: 92%; width: 92%;
height: 194rpx; height: 194rpx;
border-radius: 24rpx; border-radius: 24rpx;
background-color: #eff6ff; background-color: #eff6ff;
margin: 32rpx auto; margin: 32rpx auto;
padding: 20rpx 3%; padding: 20rpx 3%;
.title { .title {
color: #2563eb; color: #2563eb;
font-size: 28rpx; font-size: 28rpx;
margin-top: 16rpx; margin-top: 16rpx;
} }
.time { .time {
margin-top: 16rpx; margin-top: 16rpx;
color: #4b5563; color: #4b5563;
font-size: 28rpx; font-size: 28rpx;
} }
} }
.tppart { .tppart {
width: 100%; width: 100%;
max-height: 69vh; max-height: 69vh;
overflow-y: auto; overflow-y: auto;
display: grid; display: grid;
justify-items: center; justify-items: center;
.tpone { .tpone {
width: 91%; width: 91%;
height: 264rpx; height: 264rpx;
padding: 20rpx 4%; padding: 20rpx 4%;
box-sizing: border-box; box-sizing: border-box;
border-radius: 24rpx; border-radius: 24rpx;
background: linear-gradient(0deg, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.001)), #ffffff; background: linear-gradient(0deg, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.001)), #ffffff;
box-sizing: border-box; box-sizing: border-box;
border: 2rpx solid #f3f4f6; border: 2rpx solid #f3f4f6;
box-shadow: box-shadow:
0rpx 2rpx 4rpx -2rpx rgba(0, 0, 0, 0.1), 0rpx 2rpx 4rpx -2rpx rgba(0, 0, 0, 0.1),
0rpx 2rpx 6rpx 0rpx rgba(0, 0, 0, 0.1); 0rpx 2rpx 6rpx 0rpx rgba(0, 0, 0, 0.1);
margin-top: 32rpx; margin-top: 32rpx;
display: grid; display: grid;
.topp { .topp {
display: flex; display: flex;
.rightpart { .rightpart {
margin-left: 32rpx; margin-left: 32rpx;
display: grid; display: grid;
justify-items: left; justify-items: left;
align-content: baseline; align-content: baseline;
.name { .name {
font-family: Roboto; font-family: Roboto;
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
line-height: 42rpx; line-height: 42rpx;
letter-spacing: normal; letter-spacing: normal;
color: #000000; color: #000000;
margin-top: 7rpx; margin-top: 7rpx;
} }
.class { .class {
font-family: Roboto; font-family: Roboto;
font-size: 28rpx; font-size: 28rpx;
font-weight: normal; font-weight: normal;
line-height: 40rpx; line-height: 40rpx;
letter-spacing: normal; letter-spacing: normal;
color: #6b7280; color: #6b7280;
margin-top: 7rpx; margin-top: 7rpx;
} }
} }
} }
.bottomp { .bottomp {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
gap: 0rpx 20rpx; gap: 0rpx 20rpx;
.minbut { .minbut {
flex: 1; flex: 1;
width: 190rpx; width: 190rpx;
height: 76rpx; height: 76rpx;
/* 自动布局 */ /* 自动布局 */
display: flex; display: flex;
justify-content: center; justify-content: center;
padding: 16rpx 32rpx; padding: 16rpx 32rpx;
flex-wrap: wrap; flex-wrap: wrap;
align-content: flex-start; align-content: flex-start;
border-radius: 8rpx; border-radius: 8rpx;
background: #ffffff; background: #ffffff;
box-sizing: border-box; box-sizing: border-box;
border: 2rpx solid #d1d5db; border: 2rpx solid #d1d5db;
font-family: Roboto; font-family: Roboto;
font-size: 28rpx; font-size: 28rpx;
font-weight: normal; font-weight: normal;
line-height: 40rpx; line-height: 40rpx;
text-align: center; text-align: center;
letter-spacing: normal; letter-spacing: normal;
color: #4b5563; color: #4b5563;
} }
.minbut.active { .minbut.active {
border: 2rpx solid #2563eb; border: 2rpx solid #2563eb;
color: #2563eb; color: #2563eb;
} }
} }
} }
.tpone:first-child { .tpone:first-child {
margin-top: 0; margin-top: 0;
} }
} }
.bottbutton { .bottbutton {
width: 100%; width: 100%;
height: 10vh; height: 10vh;
display: flex; display: flex;
padding: 24rpx 32rpx; padding: 24rpx 32rpx;
gap: 0rpx 24rpx; gap: 0rpx 24rpx;
flex-wrap: wrap; flex-wrap: wrap;
align-content: flex-start; align-content: flex-start;
background: #ffffff; background: #ffffff;
box-sizing: border-box; box-sizing: border-box;
border-width: 2rpx 0rpx 0rpx 0rpx; border-width: 2rpx 0rpx 0rpx 0rpx;
border-style: solid; border-style: solid;
border-color: #f3f4f6; border-color: #f3f4f6;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
.qbty { .qbty {
width: 331rpx; width: 331rpx;
height: 90rpx; height: 90rpx;
/* 自动布局 */ /* 自动布局 */
display: flex; display: flex;
box-sizing: border-box; box-sizing: border-box;
justify-content: center; justify-content: center;
padding: 24rpx 0rpx; padding: 24rpx 0rpx;
gap: 0rpx 20rpx; gap: 0rpx 20rpx;
flex-wrap: wrap; flex-wrap: wrap;
border-radius: 8rpx; border-radius: 8rpx;
background: #eff6ff; background: #eff6ff;
font-family: Roboto; font-family: Roboto;
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
line-height: 42rpx; line-height: 42rpx;
text-align: center; text-align: center;
letter-spacing: normal; letter-spacing: normal;
color: #2563eb; color: #2563eb;
} }
.tjtp { .tjtp {
width: 331rpx; width: 331rpx;
height: 90rpx; height: 90rpx;
/* 自动布局 */ /* 自动布局 */
display: flex; display: flex;
box-sizing: border-box; box-sizing: border-box;
justify-content: center; justify-content: center;
padding: 24rpx 0rpx; padding: 24rpx 0rpx;
gap: 0rpx 20rpx; gap: 0rpx 20rpx;
flex-wrap: wrap; flex-wrap: wrap;
border-radius: 8rpx; border-radius: 8rpx;
background: #2563eb; background: #2563eb;
font-family: Roboto; font-family: Roboto;
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
line-height: 42rpx; line-height: 42rpx;
text-align: center; text-align: center;
letter-spacing: normal; letter-spacing: normal;
color: #ffffff; color: #ffffff;
} }
} }
.address-items { .address-items {
padding: 20rpx 15rpx 32rpx 28rpx; padding: 20rpx 15rpx 32rpx 28rpx;
background-color: #fff; background-color: #fff;
border-bottom: 2rpx solid #f5f5f5; border-bottom: 2rpx solid #f5f5f5;
.left { .left {
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
.name { .name {
font-size: 28rpx; font-size: 28rpx;
font-weight: 700; font-weight: 700;
color: #101010; color: #101010;
line-height: 40rpx; line-height: 40rpx;
margin-right: 16rpx; margin-right: 16rpx;
} }
.isdefault { .isdefault {
font-size: 20rpx; font-size: 20rpx;
font-weight: 400; font-weight: 400;
color: #fff; color: #fff;
padding: 4rpx 12rpx; padding: 4rpx 12rpx;
border-radius: 8rpx; border-radius: 8rpx;
background: linear-gradient(90deg, #4778ff 0%, #4778ffb8 100%); background: linear-gradient(90deg, #4778ff 0%, #4778ffb8 100%);
} }
.info { .info {
width: 100%; width: 100%;
color: #666; color: #666;
font-size: 24rpx; font-size: 24rpx;
font-weight: 400; font-weight: 400;
margin-top: 12rpx; margin-top: 12rpx;
} }
} }
.right { .right {
width: 140rpx; width: 140rpx;
padding-left: 32rpx; padding-left: 32rpx;
font-size: 24rpx; font-size: 24rpx;
font-weight: 400; font-weight: 400;
color: #4979ff; color: #4979ff;
text-align: right; text-align: right;
} }
} }
.buts { .buts {
width: 100%; width: 100%;
height: 10vh; height: 10vh;
background-color: F3F4F6; background-color: F3F4F6;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
border-top: 2rpx solid #ebebec; 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> </style>

BIN
src/static/img/Group.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

Write Preview
Loading…
Cancel
Save