From 2614d927eb66018b612e811f140a32e2077b630e Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 17 Jan 2022 09:41:45 +0800 Subject: [PATCH 01/38] bug --- src/apps/AppGridManagement/FamilyList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppGridManagement/FamilyList.vue b/src/apps/AppGridManagement/FamilyList.vue index 15c820fb..614dac54 100644 --- a/src/apps/AppGridManagement/FamilyList.vue +++ b/src/apps/AppGridManagement/FamilyList.vue @@ -15,7 +15,7 @@ {{item.phone}}
{{item.idNumber && item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")}}
-
{{item.currentAreaName || ''}} {{ item.currentAddress || '' }}
+
{{item.currentAreaName || ''}}{{ item.currentAddress || '' }}
From a805056e9a0856ee75754259dc66fd16435a4567 Mon Sep 17 00:00:00 2001 From: liuye Date: Mon, 17 Jan 2022 10:22:00 +0800 Subject: [PATCH 02/38] 26798 --- src/apps/AppHandSnapshot/AppHandSnapshot.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppHandSnapshot/AppHandSnapshot.vue b/src/apps/AppHandSnapshot/AppHandSnapshot.vue index c3d25556..2c7ffa79 100644 --- a/src/apps/AppHandSnapshot/AppHandSnapshot.vue +++ b/src/apps/AppHandSnapshot/AppHandSnapshot.vue @@ -9,7 +9,7 @@
-

没有网格员权限
无法查看网格信息哦~

+

没有网格员权限
无法查看随手拍信息哦~

From 70bcace7b483955bc9f518075b5e1bc3c8188c51 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: Mon, 17 Jan 2022 10:42:59 +0800 Subject: [PATCH 03/38] bug --- src/apps/AppMarryAndDie/Add.vue | 13 ++++++++++--- src/apps/AppMarryAndDie/AppMarryAndDie.vue | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/apps/AppMarryAndDie/Add.vue b/src/apps/AppMarryAndDie/Add.vue index eef95d38..96aff163 100644 --- a/src/apps/AppMarryAndDie/Add.vue +++ b/src/apps/AppMarryAndDie/Add.vue @@ -32,7 +32,7 @@
- + @@ -102,6 +102,9 @@ export default { if (!this.forms.phone) { return this.$u.toast('请输入联系电话') } + if (!this.forms.content) { + return this.$u.toast('请输入活动详情') + } const imgs = [] if (this.forms.files) { @@ -135,8 +138,12 @@ export default { }, 600) } }) - } else { - this.$u.toast('失败') + .catch(() => { + this.$u.toast('发布失败') + }) + .finally(() => { + this.flag = false + }) } }) }, diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue index 1b5363f2..79ee43e3 100644 --- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue +++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue @@ -181,8 +181,12 @@ export default { if (res.code == 0) { this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records this.pages = res.data.pages + this.$forceUpdate() } }) + .finally(() => { + this.$forceUpdate() + }) }, getEchart() { From 9f84f1b7342bd3536f9ab72b35fabb545d3ba83f 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: Mon, 17 Jan 2022 11:01:12 +0800 Subject: [PATCH 04/38] css --- src/apps/AppMarryAndDie/AppMarryAndDie.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue index 79ee43e3..c4d3b5da 100644 --- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue +++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue @@ -165,6 +165,7 @@ export default { document.title = '婚丧嫁娶' }, mounted() { + this.getList() this.Echart = echarts.init(document.getElementById('yearStatistic', 'modeType')) }, methods: { @@ -278,6 +279,7 @@ export default { this.$http.post(`/app/appmarriagefuneralinfo/delete?ids=${this.deletId}`).then((res) => { if (res.code == 0) { this.$u.toast('删除成功！') + this.$forceUpdate() this.getList() } }) @@ -417,10 +419,10 @@ uni-page-body { .myReport { padding-bottom: 105px; - // background: #f3f6f9; + // height: 100%; ::v-deep .AiCard { - background: #f3f6f9; + background: #f5f5f5; padding: 0 24px 24px 24px; .start { @@ -507,7 +509,7 @@ uni-page-body { } .u-load-more-wrap { - background: #f3f6f9 !important; + background: #f5f5f5 !important; margin: 0 !important; padding: 30px 0; } From 62bc9b3888d51e0908f63b13519b7eb4f8eaef70 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 17 Jan 2022 13:43:23 +0800 Subject: [PATCH 05/38] =?UTF-8?q?=E6=9A=82=E6=97=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppGridManagement/AddFamily.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/AppGridManagement/AddFamily.vue b/src/apps/AppGridManagement/AddFamily.vue index c6fe4744..15b57a77 100644 --- a/src/apps/AppGridManagement/AddFamily.vue +++ b/src/apps/AppGridManagement/AddFamily.vue @@ -11,7 +11,7 @@ -
+
  • @@ -36,6 +36,7 @@
+
确定选择
@@ -131,7 +132,6 @@ export default { From ffe3eb79f09c617841de1ead8acc230960376911 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: Tue, 18 Jan 2022 10:05:35 +0800 Subject: [PATCH 20/38] this.$hideLoading() --- src/apps/AppEpidemicSituation/ErrorDetail.vue | 44 +++++-------------- src/apps/AppEpidemicSituation/Health.vue | 19 ++------ src/apps/AppEpidemicSituation/UserDetail.vue | 38 +++++----------- 3 files changed, 25 insertions(+), 76 deletions(-) diff --git a/src/apps/AppEpidemicSituation/ErrorDetail.vue b/src/apps/AppEpidemicSituation/ErrorDetail.vue index aef1e8f8..943b4b47 100644 --- a/src/apps/AppEpidemicSituation/ErrorDetail.vue +++ b/src/apps/AppEpidemicSituation/ErrorDetail.vue @@ -131,43 +131,25 @@ export default { }, methods: { getUser() { - this.$loading() - this.$http - .post(`/app/appepidemicreportmember/queryDetailById?id=${this.id}`) - .then((res) => { - if (res.code == 0) { - this.userList = res.data - this.$hideLoading() - } else { - this.$hideLoading() - } - }) - .catch(() => { - this.$hideLoading() - }) + this.$http.post(`/app/appepidemicreportmember/queryDetailById?id=${this.id}`).then((res) => { + if (res.code == 0) { + this.userList = res.data + } + }) }, // 异常情况 getErrThing() { this.$loading() - this.$http - .post(`/app/appepidemichealthreport/list?memberId=${this.id}`) - .then((res) => { - if (res.code == 0) { - this.datas = res.data.records - this.$hideLoading() - } else { - this.$hideLoading() - } - }) - .catch(() => { - this.$hideLoading() - }) + this.$http.post(`/app/appepidemichealthreport/list?memberId=${this.id}`).then((res) => { + if (res.code == 0) { + this.datas = res.data.records + } + }) }, // 异常情况记录 getRecord() { - this.$loading() this.$http .post(`/app/appepidemicunusuallog/list`, null, { params: { @@ -179,14 +161,8 @@ export default { .then((res) => { if (res.code == 0) { this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records - this.$hideLoading() - } else { - this.$hideLoading() } }) - .catch(() => { - this.$hideLoading() - }) }, // 新增记录 diff --git a/src/apps/AppEpidemicSituation/Health.vue b/src/apps/AppEpidemicSituation/Health.vue index 02bb200e..0dcf900d 100644 --- a/src/apps/AppEpidemicSituation/Health.vue +++ b/src/apps/AppEpidemicSituation/Health.vue @@ -147,22 +147,11 @@ export default { }, getUserList() { - uni.showLoading({ - title: '加载数据中', + this.$http.post(`/app/appepidemicreportmember/statistic?areaId=${this.areaId}`).then((res) => { + if (res.code == 0) { + this.userList = res.data + } }) - this.$http - .post(`/app/appepidemicreportmember/statistic?areaId=${this.areaId}`) - .then((res) => { - if (res.code == 0) { - this.userList = res.data - uni.hideLoading() - } else { - uni.hideLoading() - } - }) - .catch(() => { - uni.hideLoading() - }) }, goDetail(item) { diff --git a/src/apps/AppEpidemicSituation/UserDetail.vue b/src/apps/AppEpidemicSituation/UserDetail.vue index 5955cd83..e2186e79 100644 --- a/src/apps/AppEpidemicSituation/UserDetail.vue +++ b/src/apps/AppEpidemicSituation/UserDetail.vue @@ -157,38 +157,22 @@ export default { methods: { getUser() { this.$loading() - this.$http - .post(`/app/appepidemicreportmember/queryDetailById?id=${this.userList.memberId}`) - .then((res) => { - if (res.code == 0) { - this.data = res.data - this.data.idNumber = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2") - this.$hideLoading() - } else { - this.$hideLoading() - } - }) - .catch(() => { - this.$hideLoading() - }) + this.$http.post(`/app/appepidemicreportmember/queryDetailById?id=${this.userList.memberId}`).then((res) => { + if (res.code == 0) { + this.data = res.data + this.data.idNumber = res.data.idNumber.replace(/(.{6}).*(.{4})/, '$1********$2') + } + }) }, // 异常情况记录 getRecord() { this.$loading() - this.$http - .post(`/app/appepidemicunusuallog/list?recordId=${this.userList.memberId}`) - .then((res) => { - if (res.code == 0) { - this.datas = res.data.records - this.$hideLoading() - } else { - this.$hideLoading() - } - }) - .catch(() => { - this.$hideLoading() - }) + this.$http.post(`/app/appepidemicunusuallog/list?recordId=${this.userList.memberId}`).then((res) => { + if (res.code == 0) { + this.datas = res.data.records + } + }) }, callPhone(phone) { From 836671d0a1c832622470725fda4f0b721e144385 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 18 Jan 2022 10:16:18 +0800 Subject: [PATCH 21/38] bug --- src/apps/AppResidentFile/components/document.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/apps/AppResidentFile/components/document.vue b/src/apps/AppResidentFile/components/document.vue index f39fa1be..c6e5c5b2 100644 --- a/src/apps/AppResidentFile/components/document.vue +++ b/src/apps/AppResidentFile/components/document.vue @@ -83,13 +83,16 @@ export default { } }, created() { + + }, + onLoad() { + this.$dict.load('sex', 'nation', 'education', 'job', 'faithType', 'politicsStatus', 'militaryStatus', 'householdRelation', 'householdName') console.log('居民档案性别(无字典)', this.resident.sex) console.log('居民档案性别(有字典)', this.$dict.getLabel('sex', this.resident.sex)) console.log('居民档案字典值', this.$dict.getDict('sex')) }, onShow() { document.title = '居民详情' - this.$dict.load('sex', 'nation', 'education', 'job', 'faithType', 'politicsStatus', 'militaryStatus', 'householdRelation', 'householdName') }, } From 3875f8c4aef01ebdedc0799646ea0220330269d3 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: Tue, 18 Jan 2022 10:51:40 +0800 Subject: [PATCH 22/38] 26838 --- src/apps/AppResidentFile/AppResidentFile.vue | 55 ++++++++++++-------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/src/apps/AppResidentFile/AppResidentFile.vue b/src/apps/AppResidentFile/AppResidentFile.vue index fc18d534..64cf56f4 100644 --- a/src/apps/AppResidentFile/AppResidentFile.vue +++ b/src/apps/AppResidentFile/AppResidentFile.vue @@ -61,9 +61,9 @@
- + - 共个居民 + 共个居民 @@ -83,9 +83,9 @@
- + - 共个居民群 + 共个居民群 @@ -166,7 +166,6 @@ export default { current: 1, keyword: '', data: [], - page: { current: 1, size: 10, total: 0 }, search: { name: '' }, list: [], weekList: [], @@ -194,6 +193,7 @@ export default { this.Echarts1 = echarts.init(document.getElementById('echarts1')) }, methods: { + // 居民列表 getList() { this.$http .post('/app/wxcp/wxcustomer/list', null, { @@ -201,20 +201,20 @@ export default { }) .then((res) => { if (res?.data) { - if (this.page.current > 1) { + if (this.page1.current > 1) { this.data = [...this.data, ...res.data.records] } else this.data = res.data.records - this.page.total = res.data.total + this.page1.total = res.data.total } }) }, - reachBottom() { - if (this.page.total > this.list.length) { - this.page.current++ - this.getList() - } - }, + // reachBottom() { + // if (this.page1.total > this.list.length) { + // this.page1.current++ + // this.getList() + // } + // }, showResident({ id }) { id && @@ -223,6 +223,7 @@ export default { }) }, + // 居民群列表 getList2() { this.$http .post('/app/wxcp/wxgroup/list', null, { @@ -234,20 +235,20 @@ export default { ...e, avatar: e?.avatar || this.$cdn + 'groupAvatar.png', })) - if (this.page.current > 1) { + if (this.page2.current > 1) { this.list = [...this.list, ...meta] } else this.list = meta - this.page.total = res.data.total + this.page2.total = res.data.total } }) }, - reachBottom() { - if (this.page.total > this.list.length) { - this.page.current = this.page.current + 1 - this.getList2() - } - }, + // reachBottom() { + // if (this.page2.total > this.list.length) { + // this.page2.current = this.page2.current + 1 + // this.getList2() + // } + // }, toGroupList(item) { uni.navigateTo({ @@ -495,9 +496,11 @@ export default { }) } if (this.currentTabBar == 1) { + this.page1.current == 1 this.getList() } if (this.currentTabBar == 2) { + this.page2.current == 1 this.getList2() } }, @@ -516,8 +519,14 @@ export default { }, }, onReachBottom() { - this.current = this.current + 1 - this.getList() + if (this.currentTabBar == 1) { + this.page1.current++ + this.getList() + } + if (this.currentTabBar == 2) { + this.page2.current++ + this.getList2() + } }, } From 0b10d917a1984441f5875ef0008f1d2c0104f7bc 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: Tue, 18 Jan 2022 11:05:41 +0800 Subject: [PATCH 23/38] 26844 --- src/apps/AppResidentDocument/AppResidentDocument.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/AppResidentDocument/AppResidentDocument.vue b/src/apps/AppResidentDocument/AppResidentDocument.vue index bcde1ca2..556c749f 100644 --- a/src/apps/AppResidentDocument/AppResidentDocument.vue +++ b/src/apps/AppResidentDocument/AppResidentDocument.vue @@ -30,7 +30,7 @@
{{ item.name }}
- {{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }} + {{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }} {{ item.phone }}
@@ -70,7 +70,7 @@ export default { } }, computed: { - ...mapState(['user', 'global']), + ...mapState(['user']), }, watch: {}, onLoad() { From cae009f9e612a985979e11a8d3bab1dfb62299bb 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: Tue, 18 Jan 2022 11:06:43 +0800 Subject: [PATCH 24/38] 26848 --- src/apps/AppVillageDiscuss/userList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppVillageDiscuss/userList.vue b/src/apps/AppVillageDiscuss/userList.vue index bff787f3..2aab267b 100644 --- a/src/apps/AppVillageDiscuss/userList.vue +++ b/src/apps/AppVillageDiscuss/userList.vue @@ -9,7 +9,7 @@
{{ item.userName }} - 匿名用户 + 居民 {{ item.createTime }}
From d5984de9b65cf9dc0aee8b15de765fc40e405db8 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: Tue, 18 Jan 2022 11:21:09 +0800 Subject: [PATCH 25/38] 28642 --- src/apps/AppResidentDocument/AppResidentDocument.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/apps/AppResidentDocument/AppResidentDocument.vue b/src/apps/AppResidentDocument/AppResidentDocument.vue index 556c749f..a0ac138e 100644 --- a/src/apps/AppResidentDocument/AppResidentDocument.vue +++ b/src/apps/AppResidentDocument/AppResidentDocument.vue @@ -139,14 +139,15 @@ export default {