From 0ad3bf75921fdfa25012d9ae96f9b89868b59429 Mon Sep 17 00:00:00 2001 From: wanglei <1336977847@qq.com> Date: Fri, 11 Feb 2022 11:25:20 +0800 Subject: [PATCH 1/5] bug --- src/saas/AppConflictMediation/Content.vue | 17 +++++++++-------- src/saas/AppConflictMediation/add.vue | 9 +++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue index 17f032cf..3519fc6a 100644 --- a/src/saas/AppConflictMediation/Content.vue +++ b/src/saas/AppConflictMediation/Content.vue @@ -15,11 +15,9 @@ - - - {{ forms.content.length }}/200 - +
{{ forms.content.length }}/200
+
@@ -209,10 +207,13 @@ export default { } .limit { - position: fixed; - right: 44px; - font-size: 15px; - } + text-align: right !important; + font-size: 16px; + background: #FFFFFF; + padding-right: 44px; + height: 60px; + line-height: 60px; + } .btn { position: fixed; diff --git a/src/saas/AppConflictMediation/add.vue b/src/saas/AppConflictMediation/add.vue index 4f82c016..9501e540 100644 --- a/src/saas/AppConflictMediation/add.vue +++ b/src/saas/AppConflictMediation/add.vue @@ -23,7 +23,8 @@ (最多9张)
- + +
@@ -110,7 +111,8 @@ (最多9张)
- + +
@@ -282,8 +284,7 @@ } .limit { - position: fixed; - right: 44px; + text-align: right; font-size: 16px; } From 281a2de1fcce1eb954386048560b46c756340f4d Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 11 Feb 2022 11:32:30 +0800 Subject: [PATCH 2/5] bug --- src/saas/AppBuilding/add.vue | 3 ++- src/saas/AppBuilding/components/searchMap.vue | 2 -- src/saas/AppBuilding/detail.vue | 3 +++ src/saas/AppGridManagement/Map.vue | 12 ++++++++---- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/saas/AppBuilding/add.vue b/src/saas/AppBuilding/add.vue index 5c4b9adf..ad7787c9 100644 --- a/src/saas/AppBuilding/add.vue +++ b/src/saas/AppBuilding/add.vue @@ -114,7 +114,7 @@
保存
- 请选择 + 请选择 @@ -175,6 +175,7 @@ export default { this.$http.post(`app/appcommunityhouseinfo/update`, this.houseInfo).then(res => { if (res?.code == 0) { this.$u.toast('提交成功') + uni.$emit('changeHouseInfo') setTimeout(() => { uni.navigateBack({}) }, 600) diff --git a/src/saas/AppBuilding/components/searchMap.vue b/src/saas/AppBuilding/components/searchMap.vue index 75adfe03..e9284658 100644 --- a/src/saas/AppBuilding/components/searchMap.vue +++ b/src/saas/AppBuilding/components/searchMap.vue @@ -150,7 +150,6 @@ export default { params: { current: 1, size: 1000000, - areaId: this.user.areaId } }).then(res => { if (res?.data) { @@ -299,7 +298,6 @@ export default { params: { current: 1, size: 20, - areaId: this.user.areaId, name: this.name } }).then(res => { diff --git a/src/saas/AppBuilding/detail.vue b/src/saas/AppBuilding/detail.vue index ac4ea0e2..2deea677 100644 --- a/src/saas/AppBuilding/detail.vue +++ b/src/saas/AppBuilding/detail.vue @@ -168,6 +168,9 @@ export default { this.$dict.load('householdRelation', 'houselivingStatus', 'houseLeaseSituation', 'houseUseStatus', 'isFilingCertificateStatus', 'communityBuildingType', 'yesOrNo', 'BulidResidentType') this.getBuilding() + uni.$on('changeHouseInfo', res => { + this.getHouseDetail(this.houseInfo.id) + }) }, methods: { getSelectList(communityId) { diff --git a/src/saas/AppGridManagement/Map.vue b/src/saas/AppGridManagement/Map.vue index d970386d..2a210f23 100644 --- a/src/saas/AppGridManagement/Map.vue +++ b/src/saas/AppGridManagement/Map.vue @@ -26,18 +26,22 @@
网格长 - {{ item.name }}  {{ item.phone }} + + +
网格管理员 - {{ item.name }}  {{ item.phone }} + + +
From f184cf184d639776b0c6358208ce7dd899f755ed Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 11 Feb 2022 11:38:26 +0800 Subject: [PATCH 3/5] 27090 --- src/saas/AppMailList/myAddList.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/saas/AppMailList/myAddList.vue b/src/saas/AppMailList/myAddList.vue index 1cd116a6..c2964b95 100644 --- a/src/saas/AppMailList/myAddList.vue +++ b/src/saas/AppMailList/myAddList.vue @@ -16,9 +16,11 @@
-

您还未添加通讯录
点击新增按钮试试吧

+

您还未添加通讯录 + +

-
新增
+ From 0b1c2496c34bfec0e03540cc848e1d769158c898 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 11 Feb 2022 11:44:42 +0800 Subject: [PATCH 4/5] 27103 --- src/saas/AppAskForm/Statistical.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/saas/AppAskForm/Statistical.vue b/src/saas/AppAskForm/Statistical.vue index fd7fe0d3..f771cc5b 100644 --- a/src/saas/AppAskForm/Statistical.vue +++ b/src/saas/AppAskForm/Statistical.vue @@ -44,8 +44,8 @@
-

{{ item.nickName }}

- +

{{ item.nickName }}

+

{{ item.commitTime }}

From 6253fa17e91ea2565af27da82052ac2117e60e30 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 11 Feb 2022 12:04:43 +0800 Subject: [PATCH 5/5] 27293 --- src/saas/AppGridManagement/Map.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/saas/AppGridManagement/Map.vue b/src/saas/AppGridManagement/Map.vue index 2a210f23..f8b74442 100644 --- a/src/saas/AppGridManagement/Map.vue +++ b/src/saas/AppGridManagement/Map.vue @@ -137,7 +137,12 @@ export default { } } }) - this.renderGridMap(arr) + + if (!arr.filter(v => v.points).length) { + return this.$u.toast('该网格还未标会') + } + + this.renderGridMap(arr.filter(v => v.points)) } }).catch(() => { this.$hideLoading() @@ -171,7 +176,6 @@ export default { }, renderGridMap(paths, count = 0) { - console.log(paths) let {map, lib: TMap, $refs: {AiTMap: {fitBounds}}} = this if (TMap) { if(this.latLngCenter.length) {