From 575fadb48c07a86c8fb453184e0388d8dfcb79b1 Mon Sep 17 00:00:00 2001 From: aixianling Date: Fri, 24 Dec 2021 19:11:19 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0dayjs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/util.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/util.js b/src/common/util.js index c96b5e53..2b27480e 100644 --- a/src/common/util.js +++ b/src/common/util.js @@ -1,5 +1,5 @@ import dict from "./dict"; -import $moment from './monent'; +import dayjs from './monent'; const confirm = (content, title, config) => { let ops = {content} @@ -26,11 +26,11 @@ const confirm = (content, title, config) => { const calcAge = (code) => { let birthday if (typeof code == 'string' && code.length == 18) { - birthday = $moment(code.substring(6, 14), 'YYYYMMDD') + birthday = dayjs(code.substring(6, 14), 'YYYYMMDD') } else if (typeof code == 'object') { birthday = code } - return Math.ceil($moment().year() - $moment(birthday).year()) + return Math.ceil(dayjs().year() - dayjs(birthday).year()) } export default { @@ -38,7 +38,7 @@ export default { confirm, calcAge, dateFormat: (time, format) => { - return $moment(time).format(format || 'YYYY-MM-DD').replace("Invalid Date", "") + return dayjs(time).format(format || 'YYYY-MM-DD').replace("Invalid Date", "") }, formatName: (name) => { return Array.from(name)?.slice(-2)?.toString() || ""; @@ -73,5 +73,6 @@ export default { let hex = r << 16 | g << 8 | b; return "#" + hex.toString(16); } - } + }, + dayjs } From f8209a092a9722398033d242dd23cc508b166102 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, 24 Dec 2021 19:16:20 +0800 Subject: [PATCH 2/7] 25942 --- src/apps/AppResidentActivitie/Add.vue | 1 - .../AppResidentActivities.vue | 4 ---- src/apps/AppResidentActivitie/Detail.vue | 18 +++++++++++++++++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/apps/AppResidentActivitie/Add.vue b/src/apps/AppResidentActivitie/Add.vue index 63381ef9..711d609b 100644 --- a/src/apps/AppResidentActivitie/Add.vue +++ b/src/apps/AppResidentActivitie/Add.vue @@ -80,7 +80,6 @@ export default { contactPhone: '', }, - showStartTime: false, showEndTime: false, flag: false, diff --git a/src/apps/AppResidentActivitie/AppResidentActivities.vue b/src/apps/AppResidentActivitie/AppResidentActivities.vue index cac9a182..32068554 100644 --- a/src/apps/AppResidentActivitie/AppResidentActivities.vue +++ b/src/apps/AppResidentActivitie/AppResidentActivities.vue @@ -78,10 +78,6 @@ export default { this.$dict.load(['villageActivityStatus']).then(() => { this.getList() }) - uni.$on('updateList', () => { - this.current = 1 - this.getList() - }) }, onShow() { document.title = '居民活动' diff --git a/src/apps/AppResidentActivitie/Detail.vue b/src/apps/AppResidentActivitie/Detail.vue index 69fcb46a..e0bbff41 100644 --- a/src/apps/AppResidentActivitie/Detail.vue +++ b/src/apps/AppResidentActivitie/Detail.vue @@ -102,7 +102,7 @@
编辑活动
- +
@@ -133,6 +133,8 @@ export default { ], current: 0, timeEndTime: '', + timeEnd: '', + timeNow: '', } }, onLoad(option) { @@ -145,6 +147,10 @@ export default { uni.$on('refresh', () => { this.getListInit() }) + + uni.$on('updateList', () => { + this.getDetail() + }) }, onShow() { document.title = '活动报名' @@ -154,6 +160,16 @@ export default { this.$http.post(`/app/appvillageactivityinfo/queryDetailById?id=${this.id}`).then((res) => { if (res?.data) { this.detail = res.data + console.log('结束时间', this.detail.endTime) + this.timeEnd = new Date(this.detail.endTime).getTime() + console.log('过去时间戳', this.timeEnd) + this.timeNow = new Date().getTime() + console.log('当前时间戳', this.timeNow) + console.log('过去时间戳加上24小时', this.timeEnd * 1 + 24 * 60 * 60 * 1000) + + if (this.timeNow * 1 - this.timeEnd * 1 < 24 * 60 * 60 * 1000) { + console.log('可以添加') + } if (this.detail) { if (this.detail.url) { From 086eb62ee07c344bb613fc2a8702184afbaabb94 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, 24 Dec 2021 19:17:20 +0800 Subject: [PATCH 3/7] 26015 --- src/apps/AppResidentActivitie/Detail.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/apps/AppResidentActivitie/Detail.vue b/src/apps/AppResidentActivitie/Detail.vue index e0bbff41..80a0f91c 100644 --- a/src/apps/AppResidentActivitie/Detail.vue +++ b/src/apps/AppResidentActivitie/Detail.vue @@ -28,7 +28,6 @@
活动人数
{{ detail.realNum }} -
From dab536a369a8ef27fc1cfdebd68f4e7aeb22df2f 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, 24 Dec 2021 19:19:05 +0800 Subject: [PATCH 4/7] 26013 --- src/apps/AppResidentFile/AppResidentFile.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/apps/AppResidentFile/AppResidentFile.vue b/src/apps/AppResidentFile/AppResidentFile.vue index cd80d654..07399788 100644 --- a/src/apps/AppResidentFile/AppResidentFile.vue +++ b/src/apps/AppResidentFile/AppResidentFile.vue @@ -129,7 +129,6 @@ export default { iconPath: 'home', selectedIconPath: 'home-fill', text: '统计分析', - isDot: true, customIcon: false, }, { @@ -182,7 +181,7 @@ export default { }, watch: {}, onLoad() { - document.title = '居民信息管理' + document.title = '居民信息管理' this.getEchart1() this.areaId = this.user.areaId }, From 7e6fcbc53ac286b2b890ea186ccd86b597a88308 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, 24 Dec 2021 19:25:32 +0800 Subject: [PATCH 5/7] 25939 --- src/apps/AppResidentActivitie/AppResidentActivities.vue | 5 +++++ src/apps/AppResidentActivitie/Detail.vue | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/apps/AppResidentActivitie/AppResidentActivities.vue b/src/apps/AppResidentActivitie/AppResidentActivities.vue index 32068554..c525a789 100644 --- a/src/apps/AppResidentActivitie/AppResidentActivities.vue +++ b/src/apps/AppResidentActivitie/AppResidentActivities.vue @@ -78,6 +78,11 @@ export default { this.$dict.load(['villageActivityStatus']).then(() => { this.getList() }) + + uni.$on('updateList', () => { + this.current = 1 + this.getList() + }) }, onShow() { document.title = '居民活动' diff --git a/src/apps/AppResidentActivitie/Detail.vue b/src/apps/AppResidentActivitie/Detail.vue index 80a0f91c..097aca6b 100644 --- a/src/apps/AppResidentActivitie/Detail.vue +++ b/src/apps/AppResidentActivitie/Detail.vue @@ -15,7 +15,7 @@
- {{ user.name }} + {{ detail.contactPerson }}
@@ -146,10 +146,6 @@ export default { uni.$on('refresh', () => { this.getListInit() }) - - uni.$on('updateList', () => { - this.getDetail() - }) }, onShow() { document.title = '活动报名' From 1309034d2fef8174486dca00a08b9873631befdc 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, 24 Dec 2021 19:26:43 +0800 Subject: [PATCH 6/7] 26018 --- src/apps/AppUniMsg/Add.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppUniMsg/Add.vue b/src/apps/AppUniMsg/Add.vue index bf6c06c0..dff100e8 100644 --- a/src/apps/AppUniMsg/Add.vue +++ b/src/apps/AppUniMsg/Add.vue @@ -7,7 +7,7 @@ - + From 6b2762b54a4332344047fa15ef3daa234d52636a 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, 24 Dec 2021 19:33:28 +0800 Subject: [PATCH 7/7] 26020 --- src/apps/AppResidentDocument/DetailCard.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/apps/AppResidentDocument/DetailCard.vue b/src/apps/AppResidentDocument/DetailCard.vue index 3bd6a211..af8b3165 100644 --- a/src/apps/AppResidentDocument/DetailCard.vue +++ b/src/apps/AppResidentDocument/DetailCard.vue @@ -7,7 +7,8 @@
- {{ currentAddress }} + {{ resident.currentAreaName }} + {{ resident.currentAddress }}
@@ -59,13 +60,13 @@ export default { return { id: '', data: [], - currentAddress: '', + resident: {}, } }, computed: {}, watch: {}, onLoad(o) { - document.title = '居民档案' + document.title = '居民档案' this.id = o.id this.$dict.load('householdRelation', 'fileStatus').then(() => { this.getDetail() @@ -78,7 +79,7 @@ export default { if (res.code == 0) { this.data = res.data this.$nextTick(() => { - this.currentAddress = res.data.resident.currentAddress + this.resident = res.data.resident }) } })