From 28d1e1c320bdeb6459152ca0384fd04cc33b96ce Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 28 Mar 2023 15:06:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/yanjing1.png | Bin 0 -> 321 bytes src/assets/img/yanjing2.png | Bin 0 -> 296 bytes src/views/components/resiChangeTransfer.vue | 3 +- src/views/components/resiInfo.vue | 26 ++++++++++++------ src/views/main-navbar.vue | 9 +++++- .../modules/base/community/community.vue | 24 ++++++++++++---- .../modules/base/community/communityTable.vue | 2 +- src/views/modules/base/resi.vue | 7 +++++ src/views/modules/home/index.vue | 2 +- .../plugins/change/changerelocation.vue | 3 +- .../modules/plugins/change/resideathAdd.vue | 4 +-- 11 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 src/assets/img/yanjing1.png create mode 100644 src/assets/img/yanjing2.png diff --git a/src/assets/img/yanjing1.png b/src/assets/img/yanjing1.png new file mode 100644 index 0000000000000000000000000000000000000000..a5a14daa1db99178de0e3d04a0207b7f6048ce21 GIT binary patch literal 321 zcmV-H0lxl;P)Px#`$5wzd@H_8&_{-vhZVE5MdwZO$M{m8DNfGoV^9m z_mmPppJ@Y7Vl4%PsZw7;rl$hL7`vfq+b+y~fw~?6Jm7=rLpf8Q0J1bOCD-3ufMy^} zK&&A60uY%CK?&NvJv*uFEx6H=d9&|0!8R@}53NsJ1xV7A!@SvFbDH@zAR8?sWDuF< zkcH#G&gx8;+6|&`xA3Orc-*(+%htjNX7>B(H7} T4Z~D<00000NkvXXu0mjfLG6Xe literal 0 HcmV?d00001 diff --git a/src/assets/img/yanjing2.png b/src/assets/img/yanjing2.png new file mode 100644 index 0000000000000000000000000000000000000000..ca591cb38223d935e9e59c13182a9f2cb25c27f7 GIT binary patch literal 296 zcmV+@0oVSCP)Px#;z>k7R5(w~l19elB*Yo37yC+ z_vC$&H#b7dkd}IW5iqGb)J##$5HjEtY)V1GnoWAkZ?8`~7*})9g^QFEA|=Y1q#mF$ z3ot3zrOQTl-$5f*O7^`WlPaUul^3ck*{21ufh-zG0EFTLq6OQ2?r)>xAx3xI% literal 0 HcmV?d00001 diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue index 5018b20aa..5f4f32abf 100644 --- a/src/views/components/resiChangeTransfer.vue +++ b/src/views/components/resiChangeTransfer.vue @@ -157,11 +157,10 @@
- 取 消 + 取 消 保 存联系电话:
{{resiDetailObj.showMobile?resiDetailObj.showMobile:resiDetailObj.mobile?`${resiDetailObj.mobile.substr(0,3)}`+ "****" +`${resiDetailObj.mobile.substr(7,5)}`:'--'}}
+ + 显示 + @click="handleTuomin('mobile')">{{showFlagMobileBtn?'显示':'隐藏'}}
证件号:
{{resiDetailObj.showIdNum?resiDetailObj.showIdNum:resiDetailObj.idNum?`${resiDetailObj.idNum.substr(0, 11)}` +"******" +`${resiDetailObj.idNum.substr(16, 2)}`:'--'}}
+ + 显示 + @click="handleTuomin('idCard')">{{showFlagIdCardBtn?'显示':'隐藏'}} @@ -924,7 +925,9 @@ export default { specialDtoArr:[], spouseArr:[], relationshipArr:[], - categoryDictArr:[] + categoryDictArr:[], + showFlagIdCardBtn:true, + showFlagMobileBtn:true } }, computed: { @@ -1740,14 +1743,21 @@ export default { }, async handleTuomin (type) { const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`; - const { data, code, msg } = await requestPost(url); if (code === 0) { if (type === 'mobile') { this.$set(this.resiDetailObj, 'showMobile', data.mobile) + this.showFlagMobileBtn = !this.showFlagMobileBtn + if(this.showFlagMobileBtn){ + this.$set(this.resiDetailObj, 'showMobile', data.mobile.substr(0,3) +'****'+ data.mobile.substr(7,4) ) + } } if (type === 'idCard') { this.$set(this.resiDetailObj, 'showIdNum', data.idNum) + this.showFlagIdCardBtn = !this.showFlagIdCardBtn + if(this.showFlagIdCardBtn){ + this.$set(this.resiDetailObj, 'showIdNum', data.idNum.substr(0,11) +'****'+ data.idNum.substr(16,2) ) + } } diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 3a240f1af..8c562f8f2 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -313,6 +313,9 @@ export default { if (data.unreadNum > 0 && this.unreadMsgNum < data.unreadNum) { this.getNoticeList(); this.displayedNoticeList = true; + setTimeout(()=>{ + this.displayedNoticeList = false; + },5000) } this.unreadMsgNum = data.unreadNum; } else { @@ -383,6 +386,7 @@ export default { box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12); border-radius: 4px; + .title { margin-bottom: 16px; height: 22px; @@ -435,8 +439,11 @@ export default { font-size: 14px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; - color: rgba(0, 0, 0, 0.85); line-height: 22px; + cursor: pointer; + &:hover{ + color: #0056d6 !important; + } } } diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 403e435fb..2592d8adb 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -26,7 +26,7 @@ > {{ ' ' }} --> - {{ data.label + "(" }} {{ data.showNum }} {{ ")" }} - - {{ data.showName }} + --> + {{ data.showName }} @@ -243,7 +243,7 @@ 查询 @@ -476,8 +476,20 @@ export default { ? this.clientHeight - 245 + this.iframeHeight + "px" : this.clientHeight - 245 + "px"; }, - ...mapGetters(["clientHeight", "iframeHeight"]), + showIcons(){ + return function(data){ + if(data.level=='building'){ + let arr = data.showNum.split('/') + console.log(arr); + if(arr[0] !== arr[1]){ + return true + }else{ + return false + } + } + } + }, }, watch: { // filterText (val) { diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index f07b7b56d..515910991 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -5,7 +5,7 @@ 新增小区 diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index b78ea8387..0c3e4b9d4 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -51,7 +51,7 @@
- 智能搜索 + 智能查询
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue index 56097448c..8fd6d43e7 100644 --- a/src/views/modules/plugins/change/changerelocation.vue +++ b/src/views/modules/plugins/change/changerelocation.vue @@ -164,7 +164,7 @@ 查询 @@ -321,7 +321,6 @@ slot="reference" type="text" size="small" - class="div-table-button--blue" >恢复 diff --git a/src/views/modules/plugins/change/resideathAdd.vue b/src/views/modules/plugins/change/resideathAdd.vue index 91342318a..c3d1453b0 100644 --- a/src/views/modules/plugins/change/resideathAdd.vue +++ b/src/views/modules/plugins/change/resideathAdd.vue @@ -56,10 +56,10 @@
- 取 消 + 取 消 保 存