diff --git a/src/apps/AppMailList/AppMailList.vue b/src/apps/AppMailList/AppMailList.vue index 00aca805..ad870474 100644 --- a/src/apps/AppMailList/AppMailList.vue +++ b/src/apps/AppMailList/AppMailList.vue @@ -46,7 +46,10 @@ export default { }, computed: { ...mapState(['user']) }, mounted() { - // this.getList() + this.getList() + uni.$on('updateList', () => { + this.getList() + }) }, onShow() { document.title = "便民通讯录" diff --git a/src/apps/AppMailList/add.vue b/src/apps/AppMailList/add.vue index 71cc0ecf..c058353c 100644 --- a/src/apps/AppMailList/add.vue +++ b/src/apps/AppMailList/add.vue @@ -30,7 +30,7 @@
*地区
- + {{ userInfo.areaName }} 请选择 @@ -85,8 +85,7 @@ export default { methods: { areaSelect(e) { - this.userInfo.areaId = e.id - this.userInfo.areaName = e.name + this.userInfo.areaId = e }, confirmSelect(e) { this.userInfo.isPublic = e[0].value diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue index de0a7248..f096ee8f 100644 --- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue +++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue @@ -331,6 +331,7 @@ uni-page-body { .msg { background: #fff; + height: 100%; .box { display: flex; @@ -396,11 +397,12 @@ uni-page-body { } .myReport { - background: #f3f6f9; - padding-bottom: 112px; + background: #f5f5f5 !important; + height: 100%; ::v-deep .AiCard { background: #f3f6f9; + padding: 0 24px 24px 24px; .start { display: flex; @@ -477,8 +479,12 @@ uni-page-body { } } + ::v-deep .AiCard:first-child { + padding-top: 24px; + } + .emptyWrap { - background: #f3f6f9; + background: #f5f5f5 !important; } .u-load-more-wrap { diff --git a/src/apps/AppResidentActivitie/Add.vue b/src/apps/AppResidentActivitie/Add.vue index 0c8302cf..3634a618 100644 --- a/src/apps/AppResidentActivitie/Add.vue +++ b/src/apps/AppResidentActivitie/Add.vue @@ -330,7 +330,7 @@ export default { font-size: 32px; font-weight: 500; color: #ffffff; - z-index: 999999; + z-index: 99; } } diff --git a/src/apps/AppResidentActivitie/AppResidentActivities.vue b/src/apps/AppResidentActivitie/AppResidentActivities.vue index 4f12ffff..e1a1505c 100644 --- a/src/apps/AppResidentActivitie/AppResidentActivities.vue +++ b/src/apps/AppResidentActivitie/AppResidentActivities.vue @@ -39,6 +39,8 @@ + +
diff --git a/src/apps/AppResidentDocument/DetailPeople.vue b/src/apps/AppResidentDocument/DetailPeople.vue index 9a95965e..98e5c3c2 100644 --- a/src/apps/AppResidentDocument/DetailPeople.vue +++ b/src/apps/AppResidentDocument/DetailPeople.vue @@ -9,7 +9,7 @@
{{ data.resident && data.resident.name }} - 户主 + 户主 {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }} @@ -127,7 +127,7 @@ export default { }) }, onShow() { - document.title = '家庭成员信息' + document.title = '家庭成员信息' }, methods: { getDetail() { diff --git a/src/apps/AppResidentFile/components/document.vue b/src/apps/AppResidentFile/components/document.vue index a5be6da5..f39fa1be 100644 --- a/src/apps/AppResidentFile/components/document.vue +++ b/src/apps/AppResidentFile/components/document.vue @@ -82,8 +82,13 @@ export default { familyList: [], } }, + created() { + console.log('居民档案性别(无字典)', this.resident.sex) + console.log('居民档案性别(有字典)', this.$dict.getLabel('sex', this.resident.sex)) + console.log('居民档案字典值', this.$dict.getDict('sex')) + }, onShow() { - document.title = '居民详情' + document.title = '居民详情' this.$dict.load('sex', 'nation', 'education', 'job', 'faithType', 'politicsStatus', 'militaryStatus', 'householdRelation', 'householdName') }, } diff --git a/src/apps/AppServicePublic/Add.vue b/src/apps/AppServicePublic/Add.vue index d390e367..86e94145 100644 --- a/src/apps/AppServicePublic/Add.vue +++ b/src/apps/AppServicePublic/Add.vue @@ -149,7 +149,6 @@ export default { contentType: 0 }) .then((res) => { - console.log(333) if (res.code == 0) { uni.$emit('update') this.$u.toast('发布成功') @@ -162,7 +161,7 @@ export default { }, areaSelect(e) { - this.forms.areaId = e.id + this.forms.areaId = e }, selectStatus(e) { @@ -217,7 +216,7 @@ export default { font-size: 32px; font-weight: 500; color: #ffffff; - z-index: 999999; + z-index: 9999; } .right { diff --git a/src/apps/AppServicePublic/AppServicePublic.vue b/src/apps/AppServicePublic/AppServicePublic.vue index b796b130..9f56d026 100644 --- a/src/apps/AppServicePublic/AppServicePublic.vue +++ b/src/apps/AppServicePublic/AppServicePublic.vue @@ -105,6 +105,7 @@ export default { this.getType() this.getList() uni.$on('update', () => { + this.current = 1 this.getList() }) diff --git a/src/apps/AppUniMsg/Add.vue b/src/apps/AppUniMsg/Add.vue index 80725c26..a82d8c55 100644 --- a/src/apps/AppUniMsg/Add.vue +++ b/src/apps/AppUniMsg/Add.vue @@ -51,7 +51,7 @@ export default { this.getDetail() }, onShow() { - document.title = '新增通知公告' + document.title = '新增小程序公告' }, mounted() { diff --git a/src/apps/AppUniMsg/AppUniMsg.vue b/src/apps/AppUniMsg/AppUniMsg.vue index f27cbe6e..7c81d6e7 100644 --- a/src/apps/AppUniMsg/AppUniMsg.vue +++ b/src/apps/AppUniMsg/AppUniMsg.vue @@ -24,7 +24,7 @@
-