From 6e04471f590656b6160876abf525f6b1f14aa8a3 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 24 Dec 2021 10:47:55 +0800 Subject: [PATCH 01/17] bug --- src/apps/AppMailList/list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppMailList/list.vue b/src/apps/AppMailList/list.vue index b983049f..063ca4b3 100644 --- a/src/apps/AppMailList/list.vue +++ b/src/apps/AppMailList/list.vue @@ -18,8 +18,8 @@ - + - @@ -102,6 +101,7 @@ export default { } }, onLoad(options) { + uni.setNavigationBarTitle({ title: '审批详情' }) this.objid = options.id this.type = options.type diff --git a/src/apps/AppWorkonline/detail.vue b/src/apps/AppWorkonline/detail.vue index 5c0e27aa..a9180744 100644 --- a/src/apps/AppWorkonline/detail.vue +++ b/src/apps/AppWorkonline/detail.vue @@ -237,6 +237,7 @@ export default { }, }, onLoad(options) { + uni.setNavigationBarTitle({ title: '审批详情' }) this.objid = options.id this.listType = options.listType this.getDetail() From 458e264db0f93df9ed6875daa90aa080febd6a41 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 24 Dec 2021 11:25:49 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppMarryAndDie/Add.vue | 7 +++++-- src/apps/AppMarryAndDie/AppMarryAndDie.vue | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/apps/AppMarryAndDie/Add.vue b/src/apps/AppMarryAndDie/Add.vue index dc0eb59f..e4272107 100644 --- a/src/apps/AppMarryAndDie/Add.vue +++ b/src/apps/AppMarryAndDie/Add.vue @@ -132,9 +132,12 @@ export default { }) .then((res) => { if (res.code == 0) { - this.$u.toast('发布成功') this.flag = false - uni.navigateTo({ url: `./AppMarryAndDie?indexTabs=1` }) + this.$u.toast('发布成功') + uni.$emit('updateList') + setTimeout(() => { + uni.navigateBack() + }, 600) } }) } else { diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue index 5932c82f..d11debbd 100644 --- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue +++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue @@ -150,6 +150,11 @@ export default { this.$dict.load('marriageType', 'modeType').then(() => { this.getEchart() }) + uni.$on('updateList', () => { + this.current = 1 + this.getList() + this.getEchart() + }) }, mounted() { this.Echart = echarts.init(document.getElementById('yearStatistic')) From ccd60c95d7aa511e6eacdb93e2a62f2053c037b7 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 11:26:12 +0800 Subject: [PATCH 09/17] setNavigationBarTitle --- .../AppResidentDocument.vue | 1 + src/apps/AppResidentDocument/DetailCard.vue | 1 + src/apps/AppResidentDocument/DetailPeople.vue | 1 + src/apps/AppUniMsg/Add.vue | 1 + src/apps/AppUniMsg/AppUniMsg.vue | 72 +++++++++---------- src/apps/AppUniMsg/Detail.vue | 7 +- 6 files changed, 42 insertions(+), 41 deletions(-) diff --git a/src/apps/AppResidentDocument/AppResidentDocument.vue b/src/apps/AppResidentDocument/AppResidentDocument.vue index dc9560a2..38f5016d 100644 --- a/src/apps/AppResidentDocument/AppResidentDocument.vue +++ b/src/apps/AppResidentDocument/AppResidentDocument.vue @@ -66,6 +66,7 @@ export default { }, watch: {}, onLoad() { + uni.setNavigationBarTitle({ title: '居民列表' }) this.areaId = this.user.areaId this.getList() }, diff --git a/src/apps/AppResidentDocument/DetailCard.vue b/src/apps/AppResidentDocument/DetailCard.vue index 42a506b7..c124772e 100644 --- a/src/apps/AppResidentDocument/DetailCard.vue +++ b/src/apps/AppResidentDocument/DetailCard.vue @@ -65,6 +65,7 @@ export default { computed: {}, watch: {}, onLoad(o) { + uni.setNavigationBarTitle({ title: '居民档案' }) this.id = o.id this.$dict.load('householdRelation', 'fileStatus').then(() => { this.getDetail() diff --git a/src/apps/AppResidentDocument/DetailPeople.vue b/src/apps/AppResidentDocument/DetailPeople.vue index ad49a3a3..7bfb44eb 100644 --- a/src/apps/AppResidentDocument/DetailPeople.vue +++ b/src/apps/AppResidentDocument/DetailPeople.vue @@ -121,6 +121,7 @@ export default { computed: {}, watch: {}, onLoad(o) { + uni.setNavigationBarTitle({ title: '家庭成员信息' }) this.id = o.id this.$dict.load('householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType', 'job').then(() => { this.getDetail() diff --git a/src/apps/AppUniMsg/Add.vue b/src/apps/AppUniMsg/Add.vue index f070956b..1f409b59 100644 --- a/src/apps/AppUniMsg/Add.vue +++ b/src/apps/AppUniMsg/Add.vue @@ -47,6 +47,7 @@ export default { }, computed: { ...mapState(['user']) }, onLoad(o) { + uni.setNavigationBarTitle({ title: '新增小程序公告' }) this.id = o.id this.getDetail() }, diff --git a/src/apps/AppUniMsg/AppUniMsg.vue b/src/apps/AppUniMsg/AppUniMsg.vue index 4b2d2f0a..fe05c447 100644 --- a/src/apps/AppUniMsg/AppUniMsg.vue +++ b/src/apps/AppUniMsg/AppUniMsg.vue @@ -1,7 +1,6 @@ - + -
+
- +