From 82ebdb2235942a55f87dc8f9653949b5fce377d6 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 7 Jan 2022 17:35:02 +0800 Subject: [PATCH 1/6] 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; From 62e14875dd445dc67d9fd5559a41820704dcd956 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 7 Jan 2022 17:35:33 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=91=98=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppHandSnapshot/SelectUser.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppHandSnapshot/SelectUser.vue b/src/apps/AppHandSnapshot/SelectUser.vue index 3d3e78a2..8c4485b0 100644 --- a/src/apps/AppHandSnapshot/SelectUser.vue +++ b/src/apps/AppHandSnapshot/SelectUser.vue @@ -115,7 +115,7 @@ export default { } }) }else { //查网格员 - this.$http.post(`/app/appgirdmemberinfo/listByGirdId`, {girdId: row.id}).then((res) => { + this.$http.post(`/app/appgirdmemberinfo/listByGirdIdByThree?girdId=${row.id}`).then((res) => { if (res?.data) { this.userList = res.data this.userList.map((item) => { From e7bcfcb408438597e7e25e79516d89b00526a38d Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 7 Jan 2022 17:37:25 +0800 Subject: [PATCH 3/6] 26526 --- src/apps/AppVillageDiscuss/AppVillageDiscuss.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/apps/AppVillageDiscuss/AppVillageDiscuss.vue b/src/apps/AppVillageDiscuss/AppVillageDiscuss.vue index fdfbbba5..c95ea438 100644 --- a/src/apps/AppVillageDiscuss/AppVillageDiscuss.vue +++ b/src/apps/AppVillageDiscuss/AppVillageDiscuss.vue @@ -23,9 +23,7 @@
-

- -

+

{{ item.content }}

From bd974a66c692d327c7ba5883255c59ba58c9c26c Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 7 Jan 2022 17:42:00 +0800 Subject: [PATCH 4/6] bug --- src/apps/AppVillageDiscuss/Detail.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue index 5f59d57a..06cda4be 100644 --- a/src/apps/AppVillageDiscuss/Detail.vue +++ b/src/apps/AppVillageDiscuss/Detail.vue @@ -159,7 +159,7 @@ export default { this.timestamp = discussTime - nowTime } - if (res.data.type === '1') { + if (res.data.type === '1' && res.data.statistic) { const total = Object.values(res.data.statistic).reduce((x, y) => { return x + y }) @@ -171,11 +171,12 @@ export default { } }) } + this.pageShow = true this.$hideLoading() - this.pageShow = true } else { this.$hideLoading() + this.pageShow = true } }) .catch(() => { From fb1a0375232491fcbe4ecb36a22a4ef4f643fdb2 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 7 Jan 2022 17:43:10 +0800 Subject: [PATCH 5/6] 26533 --- 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 06cda4be..15a8557c 100644 --- a/src/apps/AppVillageDiscuss/Detail.vue +++ b/src/apps/AppVillageDiscuss/Detail.vue @@ -58,7 +58,7 @@
- {{ item.content }} + {{ item.item }}：{{ item.content }} {{ item.count }}
From 1dd0b0f6a29b974a06f30bf8963a25db1c83bcaa Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 7 Jan 2022 17:49:05 +0800 Subject: [PATCH 6/6] 26534 --- src/apps/AppVillageDiscuss/Detail.vue | 29 +++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue index 15a8557c..d9526b4b 100644 --- a/src/apps/AppVillageDiscuss/Detail.vue +++ b/src/apps/AppVillageDiscuss/Detail.vue @@ -58,7 +58,10 @@
- {{ item.item }}：{{ item.content }} +
+ {{ item.item }}： + {{ item.content }} +
{{ item.count }}
@@ -434,15 +437,32 @@ export default { position: relative; align-items: center; justify-content: space-between; - height: 64px; - line-height: 64px; + padding: 24px 32px; margin-bottom: 16px; - padding: 0 32px; background: #ffffff; border-radius: 8px; overflow: hidden; border: 1px solid #95cbff; + .left { + display: flex; + flex: 1; + line-height: 1.2; + margin-right: 20px; + + span { + word-break: break-word; + + &:first-child { + flex-shrink: 1; + } + + &:last-child { + flex: 1; + } + } + } + em { position: absolute; left: 0; @@ -453,6 +473,7 @@ export default { } span { + flex-shrink: 1; position: relative; z-index: 1; color: #5b84b3;