diff --git a/.gitignore b/.gitignore
index 87c06c5..f50aa78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,6 @@ yarn-error.log*
.hbuilderx
package-lock.josn
-pnpm-lock.yaml
\ No newline at end of file
+pnpm-lock.yaml
+
+/types/auto-imports.d.ts
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index cc6864f..abaf283 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -41,7 +41,7 @@
"style": {
"navigationBarTitleText": "我的选举",
"navigationBarTextStyle": "white",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": true
}
},
{
@@ -78,7 +78,7 @@
"color": "#9CA3AF",
"selectedColor": "#2563EB",
"borderStyle": "white",
- "backgroundColor": "#F9FAFB",
+ "backgroundColor": "#FFFFFF",
"list": [
{
"pagePath": "pages/votingElection/index",
diff --git a/src/pages/myElection/index.vue b/src/pages/myElection/index.vue
index 9fa6173..e26c136 100644
--- a/src/pages/myElection/index.vue
+++ b/src/pages/myElection/index.vue
@@ -1,7 +1,332 @@
- 我的选举
+
+
+
+
+ {{ item.title }}
+
+ {{ item.type }}
+
+
+
+
+
+
+
+
+
+
+ {{ candidate.name }}
+ {{ candidate.college }}
+
+
+
+ 我的选择:
+
+ {{ choiceText(candidate.choice) }}
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
diff --git a/src/pages/votingElection/index.vue b/src/pages/votingElection/index.vue
index 085d275..7818c1d 100644
--- a/src/pages/votingElection/index.vue
+++ b/src/pages/votingElection/index.vue
@@ -9,29 +9,39 @@ const doSearch = (_formData: { page: number; limit: number }, onSuccess: Functio
data: {
data: [
{
+ id: 1,
img: '/static/img/grxx.png',
name: '陈志远',
- class: '现任财务总监'
+ class: '现任财务总监',
+ yijian: ''
},
{
+ id: 2,
img: '/static/img/grxx.png',
name: '陈志远',
- class: '现任财务总监'
+ class: '现任财务总监',
+ yijian: ''
},
{
+ id: 3,
img: '/static/img/grxx.png',
name: '陈志远',
- class: '现任财务总监'
+ class: '现任财务总监',
+ yijian: ''
},
{
+ id: 4,
img: '/static/img/grxx.png',
name: '陈志远',
- class: '现任财务总监'
+ class: '现任财务总监',
+ yijian: ''
},
{
+ id: 5,
img: '/static/img/grxx.png',
name: '陈志远',
- class: '现任财务总监'
+ class: '现任财务总监',
+ yijian: ''
}
],
total: 0
@@ -39,34 +49,39 @@ const doSearch = (_formData: { page: number; limit: number }, onSuccess: Functio
})
}
-const selectIndex = ref(0)
const buttlist = ref([
{
+ type: 'agree',
butname: '同意'
},
{
+ type: 'disagree',
butname: '反对'
},
{
+ type: 'neutral',
butname: '弃权'
}
])
-const selectBut = (index: number) => {
- selectIndex.value = index
+const selectBut = (data: any, cardid: any, type: string) => {
+ const target = data.find((card: { id: any }) => card.id === cardid)
+ if (target) {
+ target.yijian = target.yijian === type ? null : type
+ }
}
-
+
+ 2024年度董事会成员选举
+ 投票开始时间:2024年3月15日 18:00
+ 投票截止时间:2024年3月15日 18:00
+
+
-
- 2024年度董事会成员选举
- 投票开始时间:2024年3月15日 18:00
- 投票截止时间:2024年3月15日 18:00
-
@@ -83,10 +98,10 @@ const selectBut = (index: number) => {
{{ item.butname }}
@@ -105,11 +120,10 @@ const selectBut = (index: number) => {