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

对接

dev
岳鹏龙 1 year ago
parent
2267ed0129
commit
bade885783
4 changed files with 679 additions and 722 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. 21
      src/api/votingElection.ts
  2. 165
      src/manifest.json
  3. 260
      src/pages/myElection/index.vue
  4. 163
      src/pages/votingElection/index.vue

21
src/api/votingElection.ts
View File

@ -1,15 +1,28 @@
import { request } from '@/utils/http' import { request } from '@/utils/http'
// 获取投票选举（正在进行） // 获取投票选举（正在进行）
export function getCategoryData() { export function getVoteprogress() {
return request.http({ return request.http({
url: '/api/vote_progress' url: '/api/vote_progress',
method: "GET"
}) })
} }
export function feedback(data: any) { //用户投票
export function voteMember(data: any) {
return request.http({ return request.http({
url: '/api/t.feedback/add', url: '/api/vote_member',
data data
}) })
} }
// 获取我的选举
export function getMyvote() {
return request.http({
url: '/api/my_vote',
method: "GET"
})
}

165
src/manifest.json
View File

@ -1,38 +1,38 @@
{ {
"name": "问卷系统", "name" : "问卷系统",
"appid": "__UNI__1AE1F37", "appid" : "__UNI__4CC99EE",
"description": "v3+ts+uniapp模版", "description" : "v3+ts+uniapp模版",
"versionName": "1.0.68", "versionName" : "1.0.68",
"versionCode": 168, "versionCode" : 168,
"transformPx": false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus": { "app-plus" : {
"usingComponents": true, "usingComponents" : true,
"nvueStyleCompiler": "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion": 3, "compilerVersion" : 3,
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": true, "alwaysShowBeforeRender" : true,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
"compatible": { "compatible" : {
"ignoreVersion": true "ignoreVersion" : true
}, },
/* 模块配置 */ /* 模块配置 */
"modules": { "modules" : {
"Barcode": {}, "Barcode" : {},
"Camera": {}, "Camera" : {},
"VideoPlayer": {}, "VideoPlayer" : {},
"Share": {}, "Share" : {},
"Geolocation": {}, "Geolocation" : {},
"Maps": {} "Maps" : {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute": { "distribute" : {
/* android打包配置 */ /* android打包配置 */
"android": { "android" : {
"permissions": [ "permissions" : [
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
@ -49,86 +49,83 @@
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"minSdkVersion": 21 "minSdkVersion" : 21
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios": { "ios" : {
"dSYMs": false "dSYMs" : false
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs": { "sdkConfigs" : {
"ad": {}, "ad" : {},
"share": { "share" : {
"weixin": { "weixin" : {
"appid": "wxd448c878a54da98d", "appid" : "wx5d1a07b75bd48225",
"UniversalLinks": "" "UniversalLinks" : ""
} }
}, },
"geolocation": { "geolocation" : {
"amap": { "amap" : {
"name": "amap_18648278829CcsBXVUm1", "name" : "amap_18648278829CcsBXVUm1",
"__platform__": [ "__platform__" : [ "ios", "android" ],
"ios", "appkey_ios" : "37180416cb95db05dc9639e616655a7a",
"android" "appkey_android" : "37180416cb95db05dc9639e616655a7a"
],
"appkey_ios": "435934cdfcc901e4872a70391d92cccd",
"appkey_android": "435934cdfcc901e4872a70391d92cccd"
} }
}, },
"maps": { "maps" : {
"amap": { "amap" : {
"name": "amap_18648278829CcsBXVUm1", "name" : "amap_18648278829CcsBXVUm1",
"appkey_ios": "435934cdfcc901e4872a70391d92cccd", "appkey_ios" : "37180416cb95db05dc9639e616655a7a",
"appkey_android": "435934cdfcc901e4872a70391d92cccd" "appkey_android" : "37180416cb95db05dc9639e616655a7a"
} }
} }
}, },
"icons": { "icons" : {
"android": { "android" : {
"hdpi": "src/static/logo.png", "hdpi" : "src/static/logo.png",
"xhdpi": "src/static/logo.png", "xhdpi" : "src/static/logo.png",
"xxhdpi": "src/static/logo.png", "xxhdpi" : "src/static/logo.png",
"xxxhdpi": "src/static/logo.png" "xxxhdpi" : "src/static/logo.png"
} }
}, },
"splashscreen": { "splashscreen" : {
"iosStyle": "common", "iosStyle" : "common",
"androidStyle": "default", "androidStyle" : "default",
"android": { "android" : {
"hdpi": "", "hdpi" : "",
"xhdpi": "", "xhdpi" : "",
"xxhdpi": "" "xxhdpi" : ""
}, },
"ios": { "ios" : {
"storyboard": "C:/Users/Lenovo/Desktop/CustomStoryboard.zip" "storyboard" : "C:/Users/Lenovo/Desktop/CustomStoryboard.zip"
} }
} }
} }
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp": {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin": { "mp-weixin" : {
"appid": "wx5d1a07b75bd48225", "appid" : "wx5d1a07b75bd48225",
"setting": { "setting" : {
"urlCheck": false, "urlCheck" : false,
"es6": true, "es6" : true,
"postcss": false, "postcss" : false,
"minified": true "minified" : true
}, },
"usingComponents": true "usingComponents" : true
}, },
"mp-alipay": { "mp-alipay" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-baidu": { "mp-baidu" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-toutiao": { "mp-toutiao" : {
"usingComponents": true "usingComponents" : true
}, },
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
}, },
"vueVersion": "3" "vueVersion" : "3"
} }

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

@ -1,19 +1,17 @@
<template> <template>
<view class="container"> <view class="container">
<scroll-view class="scroll-view" scroll-y @scrolltolower="loadMore" :show-scrollbar="false">
<view v-for="(item, index) in electionList" :key="index" class="election-item"> <view v-for="(item, index) in electionList" :key="index" class="election-item">
<view class="year-title"> <view class="year-title">
<view class="headpart"> <view class="headpart">
<text class="title">{{ item.title }}</text> <text class="title">{{ item.title }}</text>
<view <view class="type" :style="
class="type"
:style="
item.type == '投票中' item.type == '投票中'
? 'background: #DBEAFE;color: #3B82F6;' ? 'background: #DBEAFE;color: #3B82F6;'
: item.type == '当选' : item.type == '当选'
? 'background: #DCFCE7;color: #10B981' ? 'background: #DCFCE7;color: #10B981'
: 'background: #F3F4F6;color: #4B5563' : 'background: #F3F4F6;color: #4B5563'
" ">
>
{{ item.type }} {{ item.type }}
</view> </view>
</view> </view>
@ -22,12 +20,11 @@
<view style="display: grid"> <view style="display: grid">
<view <view
v-for="(candidate, cIndex) in item.candidates.slice(0, expandedStates[index] ? item.candidates.length : 1)" v-for="(candidate, cIndex) in item.candidates.slice(0, expandedStates[index] ? item.candidates.length : 1)"
:key="cIndex" :key="cIndex" class="candidate-item">
class="candidate-item"
>
<view class="info-section"> <view class="info-section">
<view style="display: flex; align-items: center"> <view style="display: flex; align-items: center">
<img style="width: 96rpx; height: 96rpx; border-radius: 50%" :src="item.img" alt="" /> <img style="width: 96rpx; height: 96rpx; border-radius: 50%" :src="item.img"
alt="" />
<view style="margin-left: 24rpx; display: grid"> <view style="margin-left: 24rpx; display: grid">
<text class="name">{{ candidate.name }}</text> <text class="name">{{ candidate.name }}</text>
<text class="college">{{ candidate.college }}</text> <text class="college">{{ candidate.college }}</text>
@ -47,128 +44,42 @@
</view> </view>
</view> </view>
</view> </view>
</scroll-view>
</view> </view>
</template> </template>
<script setup> <script setup>
import { ref, watch } from 'vue' import {
ref,
const electionList = ref([ watch
{ } from 'vue'
type: '投票中', import {
title: '2024学生会主席选举', getMyvote
candidates: [ } from '../../api/votingElection'
{
img: '../../static/redpacket.png',
name: '陈思远', const electionList = ref([])
college: '计算机科学与技术学院', const page = ref(1)
choice: 1 const pageSize = ref(10)
}, const loading = ref(false)
{ const noMoreData = ref(false)
img: '../../static/redpacket.png',
name: '陈思远2号',
college: '计算机科学与技术学院',
choice: 0
},
{
img: '../../static/redpacket.png',
name: '陈思远2号',
college: '计算机科学与技术学院',
choice: 2
}
]
},
{
type: '投票中',
title: '2024学生会主席选举',
candidates: [
{
img: '../../static/redpacket.png',
name: '陈思远',
college: '计算机科学与技术学院',
choice: 1
},
{
img: '../../static/redpacket.png',
name: '陈思远2号',
college: '计算机科学与技术学院',
choice: 0
},
{
img: '../../static/redpacket.png',
name: '陈思远2号',
college: '计算机科学与技术学院',
choice: 2
}
]
},
{
type: '投票中',
title: '2024学生会主席选举',
candidates: [
{
img: '../../static/redpacket.png',
name: '陈思远',
college: '计算机科学与技术学院',
choice: 1
},
{
img: '../../static/redpacket.png',
name: '陈思远2号',
college: '计算机科学与技术学院',
choice: 0
},
{
img: '../../static/redpacket.png',
name: '陈思远2号',
college: '计算机科学与技术学院',
choice: 2
}
]
},
{
type: '当选',
title: '2023优秀班干部评选',
candidates: [
{
img: '../../static/redpacket.png',
name: '李雨晴',
college: '工商管理学院',
choice: 0
}
]
},
{
type: '未当选',
title: '2023最佳社团负责人',
candidates: [
{
img: '../../static/redpacket.png',
name: '王浩然',
college: '艺术设计学院',
choice: 2
}
]
}
])
// 展开状态管理 // 展开状态管理
const expandedStates = ref([]) const expandedStates = ref([])
watch( watch(
() => electionList.value, () => electionList.value,
(newVal) => { (newVal) => {
expandedStates.value = newVal.map(() => false) expandedStates.value = newVal.map(() => false)
}, }, {
{
immediate: true immediate: true
} }
) )
const toggleExpand = (index) => { const toggleExpand = (index) => {
expandedStates.value[index] = !expandedStates.value[index] expandedStates.value[index] = !expandedStates.value[index]
} }
const choiceClass = (choice) => { const choiceClass = (choice) => {
switch (choice) { switch (choice) {
case 1: case 1:
return 'agree' return 'agree'
@ -179,27 +90,56 @@ const choiceClass = (choice) => {
default: default:
return '' return ''
} }
} }
const choiceText = (choice) => { const choiceText = (choice) => {
return ( return ({
{
1: '同意', 1: '同意',
0: '反对', 0: '反对',
2: '弃权' 2: '弃权'
}[choice] || '' } [choice] || '')
) }
}
// 获取数据
const getList = async () => {
try {
loading.value = true
// 模拟接口请求（替换为你的真实接口）
const mockData = await getMyvote().then((res)=> {
})
// 处理数据
dataList.value = [...dataList.value, ...mockData]
// 判断是否还有数据
noMoreData.value = mockData.length < pageSize.value
} finally {
loading.value = false
}
}
// 加载更多
const loadMore = () => {
if (loading.value || noMoreData.value) return
page.value += 1
getList()
}
onMounted(() => {
getList()
})
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.container { .container {
padding: 20rpx; padding: 20rpx;
background-color: #f9fafb; background-color: #f9fafb;
height: 100vh; height: 100vh;
} }
.election-item { .election-item {
margin-bottom: 30rpx; margin-bottom: 30rpx;
padding: 34rpx; padding: 34rpx;
border-radius: 24rpx; border-radius: 24rpx;
@ -207,9 +147,9 @@ const choiceText = (choice) => {
box-sizing: border-box; box-sizing: border-box;
border: 2rpx solid #f3f4f6; border: 2rpx solid #f3f4f6;
box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.05); box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.05);
} }
.year-title { .year-title {
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
color: #333; color: #333;
@ -242,91 +182,91 @@ const choiceText = (choice) => {
border-radius: 24rpx; border-radius: 24rpx;
} }
} }
} }
.candidate-item { .candidate-item {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 20rpx 0; padding: 20rpx 0;
} }
.info-section { .info-section {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.name { .name {
font-family: Roboto; font-family: Roboto;
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
letter-spacing: normal; letter-spacing: normal;
color: #000000; color: #000000;
} }
.college { .college {
font-family: Roboto; font-family: Roboto;
font-size: 24rpx; font-size: 24rpx;
font-weight: normal; font-weight: normal;
letter-spacing: normal; letter-spacing: normal;
color: #6b7280; color: #6b7280;
} }
.choice-tag { .choice-tag {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-family: Roboto; font-family: Roboto;
font-size: 28rpx; font-size: 28rpx;
font-weight: normal; font-weight: normal;
} }
.agree { .agree {
color: #3b82f6; color: #3b82f6;
} }
.oppose { .oppose {
color: #f44336; color: #f44336;
} }
.abstain { .abstain {
color: #9ca3af; color: #9ca3af;
} }
.year-title { .year-title {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.expand-btn { .expand-btn {
display: flex; display: flex;
align-items: center; align-items: center;
color: #666; color: #666;
font-size: 26rpx; font-size: 26rpx;
padding: 10rpx 20rpx; padding: 10rpx 20rpx;
} }
.arrow { .arrow {
display: inline-block; display: inline-block;
width: 0; width: 0;
height: 0; height: 0;
margin-left: 10rpx; margin-left: 10rpx;
border-left: 10rpx solid transparent; border-left: 10rpx solid transparent;
border-right: 10rpx solid transparent; border-right: 10rpx solid transparent;
} }
.down { .down {
border-top: 15rpx solid #999; border-top: 15rpx solid #999;
} }
.up { .up {
border-bottom: 15rpx solid #999; border-bottom: 15rpx solid #999;
} }
/* 优化候选人项间距 */ /* 优化候选人项间距 */
.candidate-item:last-child { .candidate-item:last-child {
border-bottom: none; border-bottom: none;
} }
</style> </style>

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

@ -1,127 +1,134 @@
<script setup lang="ts"> <script setup lang="ts">
import { getCategoryData } from '../../api/votingElection' import { getVoteprogress, voteMember } from '../../api/votingElection'
import { getUserList } from '../../api/user'
import useUserStore from '@/store/user'
const userStore = useUserStore()
const doSearch = (_formData: { page: number; limit: number }, onSuccess: Function) => { const xjList = ref({})
// const submitData = { ...formData } const doSearch = (_formData : { page : number; limit : number }, onSuccess : Function) => {
// listApi(submitData, userStore.useType).then((res) => { getVoteprogress().then((res) => {
// const { data } = res as { data: { data: any; total: number } } xjList.value = res.data
// onSuccess({ 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 })
})
onSuccess({
data: {
data: [
{
id: 1,
img: '',
name: '陈志远',
class: '现任财务总监',
yijian: ''
},
{
id: 2,
img: '',
name: '陈志远',
class: '现任财务总监',
yijian: ''
},
{
id: 3,
img: '',
name: '陈志远',
class: '现任财务总监',
yijian: ''
},
{
id: 4,
img: '',
name: '陈志远',
class: '现任财务总监',
yijian: ''
},
{
id: 5,
img: '',
name: '陈志远',
class: '现任财务总监',
yijian: ''
} }
],
total: 0
}
})
}
const buttlist = ref([ const buttlist = ref([
{ {
type: 'agree', type: '1',
butname: '同意' butname: '同意'
}, },
{ {
type: 'disagree', type: '2',
butname: '反对' butname: '反对'
}, },
{ {
type: 'neutral', type: '3',
butname: '弃权' butname: '弃权'
} }
]) ])
const params = ref([])
const selectBut = (data: any, cardid: any, type: string, butname: string) => { const selectBut = (data : any, cardid : any, type : string, butname : string) => {
const target = data.find((card: { id: any }) => card.id === cardid) if (cardid) {
const target = data.find((card : { id : any }) => card.id === cardid)
uni.showModal({ uni.showModal({
title: '您本轮选举投' + butname + '票', title: '您本轮选举投' + butname + '票',
content: '确定吗？', content: '确定吗？',
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
if (target) { if (target) {
target.yijian = target.yijian === type ? null : type 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) { } else if (res.cancel) {
console.log('用户点击取消') console.log('用户点击取消')
} }
} }
}) })
} }
onShow(()=> { function extractTwoProps(arr:any, key1:string, key2:string) {
getCategoryData().then((res)=> { return arr.map(({ [key1]: prop1, [key2]: prop2 }) => ({
console.log(res,55555555555) [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)
}) })
}) }
}
</script> </script>
<template> <template>
<!-- 你的页面内容 --> <!-- 你的页面内容 -->
<view class="box"> <view class="box">
<view class="headpart"> <view class="headpart">
<view class="title">2024年度董事会成员选举</view> <view class="title">{{ xjList.title }}</view>
<view class="time">投票开始时间：2024年3月15日 18:00</view> <view class="time">投票开始时间：{{ xjList.start_time }}</view>
<view class="time">投票截止时间：2024年3月15日 18:00</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.img" 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.class }} {{ 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"
v-for="(item, ele) in buttlist"
:key="ele"
@click="selectBut(data, row.id, item.type, item.butname)" @click="selectBut(data, row.id, item.type, item.butname)"
:class="{ active: row.yijian === item.type }" :class="{ active: row.vote_result === item.type }">
>
{{ item.butname }} {{ item.butname }}
</view> </view>
</view> </view>
@ -130,14 +137,14 @@ onShow(()=> {
</template> </template>
</ex-list> </ex-list>
<view class="bottbutton"> <view class="bottbutton">
<view class="qbty">全部同意</view> <view class="qbty" @click="allChange">全部同意</view>
<view class="tjtp">提交投票</view> <view class="tjtp" @click="submit">提交投票</view>
</view> </view>
</view> </view>
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">
.box { .box {
width: 100%; width: 100%;
background-color: #f9fafb; background-color: #f9fafb;
@ -367,5 +374,5 @@ onShow(()=> {
bottom: 0; bottom: 0;
border-top: 2rpx solid #ebebec; border-top: 2rpx solid #ebebec;
} }
} }
</style> </style>
Write Preview
Loading…
Cancel
Save