diff --git a/src/apps/AppVillageDiscuss/Add.vue b/src/apps/AppVillageDiscuss/Add.vue index 182cf053..22fbb46a 100644 --- a/src/apps/AppVillageDiscuss/Add.vue +++ b/src/apps/AppVillageDiscuss/Add.vue @@ -35,14 +35,14 @@
-
+ +
+
- +
@@ -133,6 +133,7 @@ export default { }, submit() { + let list = [] if (this.flag) return if (!this.form.content) { return this.$u.toast('请输入主题') @@ -146,26 +147,27 @@ export default { if (!this.form.publicityDeadline) { return this.$u.toast('请选择公示截止时间') } - if (this.form.type == 1 && this.opts == 0 && !this.contents) { - return this.$u.toast('请输入单选选项') - } - if (this.opts == 1 && !this.list.length) { - return this.$u.toast('请输入多选选项') - } - if (this.contents) { - this.list.push(this.contents) - } - if (this.opts == 1) { - var lists = [] - this.list.map((item, index) => { - item.contents == item, item.item == this.keys[index] - lists.push({ - content: item, - item: this.keys[index], - }) + if (this.form.type === '1') { + if (!this.list.length) { + return this.$u.toast('请添加选项') + } + if (this.list.length < 2) { + return this.$u.toast('选项不能少于2个') + } + + list = this.list.map((v, index) => { + return { + content: v.content, + item: this.keys[index] + } }) - console.log(lists) + + for (let i = 0; i < list.length; i ++) { + if (!list[i].content) { + return this.$u.toast(`请输入弟${i + 1}个选项的内容`) + } + } } var params = { @@ -173,7 +175,7 @@ export default { // voteItems: this.list, areaId: this.form.areaId, areaName: this.form.areaName, - voteItems: lists, + voteItems: list, anonymous: this.checked == true ? 1 : 0, createUserId: this.user.id, createUserName: this.user.name, @@ -194,11 +196,12 @@ export default { }, addOpts() { - if (!this.contents) { - return this.$u.toast('请输入选项内容') - } - this.list.push(this.contents) - this.contents = '' + // if (!this.contents) { + // return this.$u.toast('请输入选项内容') + // } + this.list.push({ + content: '' + }) }, del(index) { @@ -211,8 +214,6 @@ export default { }, confirmTime(e) { - console.log(e) - if (this.showStartTime == true) { var nowTime = new Date().getTime() * 1 diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue index db601c2e..e98aed89 100644 --- a/src/apps/AppVillageDiscuss/Detail.vue +++ b/src/apps/AppVillageDiscuss/Detail.vue @@ -141,7 +141,7 @@ export default { this.timestamp = discussTime - nowTime } - if (res.data.voteType === '1') { + if (res.data.type === '1') { const total = Object.values(res.data.statistic).reduce((x, y) => { return x + y })