diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index 7876f0cc..f258e13f 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -368,3 +368,72 @@ export function getLoginBook() {
method: 'get'
})
}
+
+// 查询投票主题列表
+export function listPoll(deptId , query) {
+ return request({
+ url: `/villageAffairs/public/poll/list/${deptId}`,
+ method: 'get',
+ params: query
+ })
+}
+
+// 姓名, 账套ID, 身份证, 返回里会有个id字段
+export function checkFarmer(data) {
+ return request({
+ url: '/register/checkFarmer',
+ method: 'post',
+ data: data,
+ })
+}
+
+// 查询投票主题详细
+export function getPoll(id) {
+ return request({
+ url: `/villageAffairs/public/poll/detail/${id}`,
+ method: 'get'
+ })
+}
+
+// 投票 id为主题ID, option为投票选项ID, 多个用,分隔, userId为认证后的农户ID
+export function votePoll(id, data) {
+ return request({
+ url: `/villageAffairs/public/poll/vote/${id}`,
+ method: 'post',
+ params: data,
+ })
+}
+
+// 新增投票主题
+export function addPoll(data) {
+ return request({
+ url: '/poll/poll/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改投票主题
+export function updatePoll(data) {
+ return request({
+ url: '/poll/poll/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除投票主题
+export function delPoll(id) {
+ return request({
+ url: '/poll/poll/remove/' + id,
+ method: 'get'
+ })
+}
+
+// 发布投票主题
+export function publicPoll(id) {
+ return request({
+ url: '/poll/poll/publicPoll/'+ id,
+ method: 'get'
+ })
+}
diff --git a/src/assets/images/sunVillage_info/icon_cj.png b/src/assets/images/sunVillage_info/icon_cj.png
new file mode 100644
index 00000000..0028ffd7
Binary files /dev/null and b/src/assets/images/sunVillage_info/icon_cj.png differ
diff --git a/src/assets/images/sunVillage_info/icon_sm.png b/src/assets/images/sunVillage_info/icon_sm.png
new file mode 100644
index 00000000..2ca503ca
Binary files /dev/null and b/src/assets/images/sunVillage_info/icon_sm.png differ
diff --git a/src/assets/images/sunVillage_info/icon_vote.png b/src/assets/images/sunVillage_info/icon_vote.png
new file mode 100644
index 00000000..43ed7170
Binary files /dev/null and b/src/assets/images/sunVillage_info/icon_vote.png differ
diff --git a/src/assets/images/sunVillage_info/index_block_1_rights.png b/src/assets/images/sunVillage_info/index_block_1_rights.png
new file mode 100644
index 00000000..92eb4d2e
Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_1_rights.png differ
diff --git a/src/assets/images/sunVillage_info/index_block_2_rights.png b/src/assets/images/sunVillage_info/index_block_2_rights.png
new file mode 100644
index 00000000..5b27f8bd
Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_2_rights.png differ
diff --git a/src/assets/images/sunVillage_info/index_block_3_rights.png b/src/assets/images/sunVillage_info/index_block_3_rights.png
new file mode 100644
index 00000000..7193ad9a
Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_3_rights.png differ
diff --git a/src/assets/images/sunVillage_info/index_block_4_rights.png b/src/assets/images/sunVillage_info/index_block_4_rights.png
new file mode 100644
index 00000000..f0e2d987
Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_4_rights.png differ
diff --git a/src/assets/images/sunVillage_info/index_block_8.png b/src/assets/images/sunVillage_info/index_block_8.png
new file mode 100644
index 00000000..446786e3
Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_8.png differ
diff --git a/src/assets/images/sunVillage_info/index_btn.png b/src/assets/images/sunVillage_info/index_btn.png
new file mode 100644
index 00000000..98c31287
Binary files /dev/null and b/src/assets/images/sunVillage_info/index_btn.png differ
diff --git a/src/assets/images/sunVillage_info/index_title2_rights.png b/src/assets/images/sunVillage_info/index_title2_rights.png
new file mode 100644
index 00000000..d21dccea
Binary files /dev/null and b/src/assets/images/sunVillage_info/index_title2_rights.png differ
diff --git a/src/assets/images/sunVillage_info/login_head_code.png b/src/assets/images/sunVillage_info/login_head_code.png
new file mode 100644
index 00000000..4e93ab6a
Binary files /dev/null and b/src/assets/images/sunVillage_info/login_head_code.png differ
diff --git a/src/assets/images/sunVillage_info/login_head_h_rights.png b/src/assets/images/sunVillage_info/login_head_h_rights.png
new file mode 100644
index 00000000..fba033d3
Binary files /dev/null and b/src/assets/images/sunVillage_info/login_head_h_rights.png differ
diff --git a/src/assets/images/sunVillage_info/login_head_nr_code.png b/src/assets/images/sunVillage_info/login_head_nr_code.png
new file mode 100644
index 00000000..7d5f83ba
Binary files /dev/null and b/src/assets/images/sunVillage_info/login_head_nr_code.png differ
diff --git a/src/assets/images/sunVillage_info/login_icon_2_code.png b/src/assets/images/sunVillage_info/login_icon_2_code.png
new file mode 100644
index 00000000..eb06ef0d
Binary files /dev/null and b/src/assets/images/sunVillage_info/login_icon_2_code.png differ
diff --git a/src/components/form/SubjectTreeChooser.vue b/src/components/form/SubjectTreeChooser.vue
index a7655f04..e5d79f94 100644
--- a/src/components/form/SubjectTreeChooser.vue
+++ b/src/components/form/SubjectTreeChooser.vue
@@ -8,7 +8,7 @@
/>
投票
+ + +投票选项
+ +{{form.subjectName}}
+{{form.description}}
+{{form.anonymous == '1' ? '匿名':'实名'}}
+{{form.type == '1' ? '单选':'多选'}}
+{{form.nums}}人已参加
+{{item.name}}
+{{item.num}}票
+87%
+截止时间:{{form.endTime}}
+发起人:{{form.promoters}}
+投票选项
+ +{{form.subjectName}}
+{{form.description}}
+{{form.anonymous == '1' ? '匿名':'实名'}}
+{{form.type == '1' ? '单选':'多选'}}
+{{form.nums}}人已参加
+{{item.name}}
+{{item.num}}票
+87%
+{{item.name}}
+{{item.num}}票
+87%
+截止时间:{{form.endTime}}
+发起人:{{form.promoters}}
+