From d5bdc4d89f84d9b97db3f063fae2544d2b96a01b Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 7 Jan 2022 17:23:13 +0800 Subject: [PATCH 1/4] 26528 --- src/apps/AppVillageDiscuss/Detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue index e98aed89..8cd9c271 100644 --- a/src/apps/AppVillageDiscuss/Detail.vue +++ b/src/apps/AppVillageDiscuss/Detail.vue @@ -256,7 +256,7 @@ export default { id: this.id }).then((res) => { if (res?.code == 0) { - this.$u.toast('已结束公示!') + this.$u.toast('结束公示成功!') this.getDetail() } }) From 01b27fbe9b8c827da21f44473babc44189781543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 7 Jan 2022 17:27:06 +0800 Subject: [PATCH 2/4] 26396 --- src/apps/AppVillageDiscuss/Add.vue | 2 +- src/apps/AppVillageDiscuss/Detail.vue | 42 +++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/src/apps/AppVillageDiscuss/Add.vue b/src/apps/AppVillageDiscuss/Add.vue index 182cf053..a712e228 100644 --- a/src/apps/AppVillageDiscuss/Add.vue +++ b/src/apps/AppVillageDiscuss/Add.vue @@ -185,7 +185,7 @@ export default { if (res.code == 0) { uni.$emit('update') this.$u.toast('发布成功') - this.flag = true + this.flag = publish setTimeout(() => { uni.navigateBack({}) }, 600) diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue index b7503dc9..07f853b0 100644 --- a/src/apps/AppVillageDiscuss/Detail.vue +++ b/src/apps/AppVillageDiscuss/Detail.vue @@ -38,7 +38,9 @@ -
+ +
+
@@ -79,6 +81,13 @@
+ +
删除
+
取消
+ + + +
结束公示
@@ -99,6 +108,9 @@ export default { flag: false, pageShow: false, isAnnouncer: false, + deleShow: false, + modalShow: false, + deleId: '', } }, computed: { @@ -191,7 +203,21 @@ export default { }) }, - dele() {}, + adddeleShow(id) { + this.deleId = id + this.deleShow = true + }, + + confirmDelete() { + this.$http.post(`/app/appvillagediscussmessage/delete?ids=${this.deleId}`).then((res) => { + if (res?.data) { + this.deleShow = false + this.modalShow = false + this.deleId = '' + this.getDetail() + } + }) + }, publish() { if (this.flag) return @@ -210,7 +236,7 @@ export default { .then((res) => { if (res?.code == 0) { this.$u.toast('留言成功') - this.flag = true + this.flag = false this.content = '' this.showBottomInput = false this.getDetail() @@ -545,6 +571,16 @@ export default { } } + .popupdele { + ::v-deep .u-drawer-content { + text-align: center; + div { + padding: 5px 0; + color: #666; + } + } + } + // ::v-deep .u-drawer { // .u-drawer-content { // .u-drawer__scroll-view { From 53799852369b2be6490a5febac5e636bfc5a844d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 7 Jan 2022 17:32:35 +0800 Subject: [PATCH 3/4] 26527 --- src/apps/AppVillageDiscuss/Add.vue | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/apps/AppVillageDiscuss/Add.vue b/src/apps/AppVillageDiscuss/Add.vue index 4e380a94..0600e818 100644 --- a/src/apps/AppVillageDiscuss/Add.vue +++ b/src/apps/AppVillageDiscuss/Add.vue @@ -144,9 +144,6 @@ export default { if (!this.form.discussDeadline) { return this.$u.toast('请选择议事截止时间') } - if (!this.form.publicityDeadline) { - return this.$u.toast('请选择公示截止时间') - } if (this.form.type === '1') { if (!this.list.length) { @@ -159,13 +156,13 @@ export default { list = this.list.map((v, index) => { return { content: v.content, - item: this.keys[index] + item: this.keys[index], } }) - for (let i = 0; i < list.length; i ++) { + for (let i = 0; i < list.length; i++) { if (!list[i].content) { - return this.$u.toast(`请输入弟${i + 1}个选项的内容`) + return this.$u.toast(`请输入第${i + 1}个选项的内容`) } } } @@ -200,7 +197,7 @@ export default { // return this.$u.toast('请输入选项内容') // } this.list.push({ - content: '' + content: '', }) }, From 82ebdb2235942a55f87dc8f9653949b5fce377d6 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 7 Jan 2022 17:35:02 +0800 Subject: [PATCH 4/4] 26525 --- src/apps/AppVillageDiscuss/Add.vue | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/apps/AppVillageDiscuss/Add.vue b/src/apps/AppVillageDiscuss/Add.vue index 0600e818..69f0bb60 100644 --- a/src/apps/AppVillageDiscuss/Add.vue +++ b/src/apps/AppVillageDiscuss/Add.vue @@ -42,10 +42,10 @@
- +
-
+
添加选项
@@ -144,7 +144,6 @@ export default { if (!this.form.discussDeadline) { return this.$u.toast('请选择议事截止时间') } - if (this.form.type === '1') { if (!this.list.length) { return this.$u.toast('请添加选项') @@ -156,13 +155,13 @@ export default { list = this.list.map((v, index) => { return { content: v.content, - item: this.keys[index], + item: this.keys[index] } }) - for (let i = 0; i < list.length; i++) { + for (let i = 0; i < list.length; i ++) { if (!list[i].content) { - return this.$u.toast(`请输入第${i + 1}个选项的内容`) + return this.$u.toast(`请输入弟${i + 1}个选项的内容`) } } } @@ -184,7 +183,7 @@ export default { if (res.code == 0) { uni.$emit('update') this.$u.toast('发布成功') - this.flag = publish + this.flag = true setTimeout(() => { uni.navigateBack({}) }, 600) @@ -197,7 +196,7 @@ export default { // return this.$u.toast('请输入选项内容') // } this.list.push({ - content: '', + content: '' }) }, @@ -206,7 +205,6 @@ export default { }, areaSelect(e) { - console.log(e) this.form.areaId = e }, @@ -316,11 +314,16 @@ export default { display: flex; justify-content: space-between; align-items: center; - padding: 0 40px 0 32px !important; + padding: 20px 40px 0 !important; width: 100%; - height: 120px; - line-height: 120px; + // height: 120px; + // line-height: 120px; box-sizing: border-box; + + ::v-deep .u-input__textarea { + padding-bottom: 20px; + } + img { width: 36px; height: 36px;