diff --git a/src/apps/AppResidentDocument/AppResidentDocument.vue b/src/apps/AppResidentDocument/AppResidentDocument.vue index 9cf4876e..b787b3d1 100644 --- a/src/apps/AppResidentDocument/AppResidentDocument.vue +++ b/src/apps/AppResidentDocument/AppResidentDocument.vue @@ -2,12 +2,12 @@
- +
- +
@@ -72,6 +72,7 @@ export default { }, ], currentTabs: 0, + areaId: '' } }, computed: { @@ -79,6 +80,7 @@ export default { }, watch: {}, onLoad() { + this.areaId = this.user.areaId this.getList() }, onShow() {}, diff --git a/src/apps/AppResidentDocument/DetailCard.vue b/src/apps/AppResidentDocument/DetailCard.vue index 4e7ae0fa..b473476e 100644 --- a/src/apps/AppResidentDocument/DetailCard.vue +++ b/src/apps/AppResidentDocument/DetailCard.vue @@ -7,27 +7,27 @@
- {{ currentAreaName }} + {{ currentAddress }}
-
家庭成员
+
家庭成员{{data.family.length}}
- +
{{ item.name }} - 户主 + 户主 - {{ $dict.getLabel('householdRelation', item.householdName) }} + {{ $dict.getLabel('householdRelation', item.householdRelation) }}
@@ -38,7 +38,7 @@
身份证号: - {{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }} + {{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1******$2') }}
@@ -58,7 +58,7 @@ export default { return { id: '', data: [], - currentAreaName: '', + currentAddress: '', } }, computed: {}, @@ -76,7 +76,7 @@ export default { if (res.code == 0) { this.data = res.data this.$nextTick(() => { - this.currentAreaName = res.data.resident.currentAreaName + this.currentAddress = res.data.resident.currentAddress }) } }) diff --git a/src/apps/AppResidentDocument/DetailPeople.vue b/src/apps/AppResidentDocument/DetailPeople.vue index 79d164dd..fcbf24d7 100644 --- a/src/apps/AppResidentDocument/DetailPeople.vue +++ b/src/apps/AppResidentDocument/DetailPeople.vue @@ -3,16 +3,16 @@
- +
{{ data.resident.name }} - 户主 + 户主 - {{ $dict.getLabel('householdRelation', data.resident.householdName) }} + {{ $dict.getLabel('householdRelation', data.resident.householdRelation) }}
@@ -27,7 +27,7 @@
- 家庭地址 + 籍贯 {{ data.resident.birthplaceAreaName }}
@@ -81,7 +81,7 @@
联系方式 - {{ data.resident.phone }} + {{ data.resident.phone }}
@@ -139,6 +139,9 @@ export default { } }) }, + callPhone(phone) { + uni.makePhoneCall({ phoneNumber: phone }) + }, }, } diff --git a/src/apps/AppServicePublic/AppServicePublic.vue b/src/apps/AppServicePublic/AppServicePublic.vue index f406a70c..4441d84e 100644 --- a/src/apps/AppServicePublic/AppServicePublic.vue +++ b/src/apps/AppServicePublic/AppServicePublic.vue @@ -95,6 +95,7 @@ export default { uni.$on('update' , () => { this.getList() }) + uni.setNavigationBarTitle({title: this.listName}) }, methods: { getType() { diff --git a/src/apps/AppUniMsg/Detail.vue b/src/apps/AppUniMsg/Detail.vue index d80b7641..3866687c 100644 --- a/src/apps/AppUniMsg/Detail.vue +++ b/src/apps/AppUniMsg/Detail.vue @@ -13,7 +13,7 @@ {{ data.content }}
- +
@@ -48,6 +48,12 @@ export default { } }) }, + previewImage (images, img) { + uni.previewImage({ + urls: images.map(v => v.url), + current: img + }) + }, }, }