From 6a9e685985803e5c4197f52b2f292d45dadc94bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Tue, 5 Nov 2024 14:08:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=EF=BC=8C=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=81=EF=BC=8C=E7=AD=89=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/portrayal/jumin/index.vue | 32 ++++++++++-----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index 721bcb175..cf0ebe305 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -9,22 +9,24 @@
           {{ resiDetailObj.baseInfoDto.name }}（{{ resiDetailObj.baseInfoDto.age }}岁）</span
         >
         <span v-else> -- </span>
-        <div style="display: flex;flex-direction: row;">     
-          <img
+        <div style="display: flex;flex-direction: row; justify-content: center;align-self: center; height: 15px;">     
+          <div style="display: flex;flex-direction: row; justify-content: center;align-self: center; ">
+            <img
             v-show="showFlagnameBtn"
             src="@/assets/img/yanjing1.png"
             alt=""
             width="14px"
-            style="width: 14px; height: 14px;"
+            style="width: 14px;height: 14px;margin-top: 12px" 
           />
           <img
             v-show="!showFlagnameBtn"
             src="@/assets/img/yanjing2.png"
             alt=""
             width="14px"
-            style="width: 14px;height: 14px;"
+            style="width: 14px; height: 14px;margin-top: 12px"
 
           />
+          </div>
            <el-button
             type="text"
             class="div-table-button--blue"
@@ -1380,13 +1382,6 @@ export default {
               this.menuList.push({name:'死亡信息',id:'deathDto'});
               this.expandList.push({title:'死亡信息',scrollId:'deathDto',children:[{label:'死亡时间',value:this.resiDetailObj.baseInfoDto.deathDate}]})
             }
-            // console.log(typeof this.resiDetailObj.baseInfoDto.resiId,localStorage.getItem('baseInfoDtonameID').replace(/^"([^"]*)"$/, '$1'));
-            // console.log(typeof localStorage.getItem('baseInfoDtonameID'));
-            
-          // console.log(localStorage.getItem('baseInfoDtoName')&&localStorage.getItem('baseInfoDtonameID')===this.resiDetailObj.baseInfoDto.resiId,
-          // this.resiDetailObj.baseInfoDto.resiId,localStorage.getItem('baseInfoDtonameID'));
-          // console.log(this.resiDetailObj.baseInfoDto.resiId);
-          // console.log(localStorage.getItem('baseInfoDtoName')&&localStorage.getItem('baseInfoDtonameID').replace(/^"([^"]*)"$/, '$1')===this.resiDetailObj.baseInfoDto.resiId);
           if (localStorage.getItem('baseInfoDtoName')&&(localStorage.getItem('baseInfoDtonameID').replace(/^"([^"]*)"$/, '$1')===this.resiDetailObj.baseInfoDto.resiId.toString())) {
             const expiry = localStorage.getItem('data_expiry');
             if (expiry && Date.now() < parseInt(expiry)) {
@@ -1395,21 +1390,24 @@ export default {
               this.showFlagnameBtn = false
             }
           }
-          if (localStorage.getItem('baseInfoDtoidNum')&&localStorage.getItem('baseInfoDtoidCardID').replace(/^"([^"]*)"$/, '$1')===this.resiDetailObj.baseInfoDto.resiId) {
-           
-            const expiry = localStorage.getItem('baseInfoDtoidNum');
+          if (localStorage.getItem('baseInfoDtoidNum')&&
+          (localStorage.getItem('baseInfoDtoidCardID').replace(/^"([^"]*)"$/, '$1')===this.resiDetailObj.baseInfoDto.resiId)) {
+            
+            const expiry = localStorage.getItem('data_expiryidNum');
+            console.log(expiry);
+            
             if (expiry && Date.now() < parseInt(expiry)) {
               const name = JSON.parse(localStorage.getItem('baseInfoDtoidNum'))
               this.$set(this.resiDetailObj.baseInfoDto, "idNum", name);
-              this.showFlagnameBtn = false
+              this.showFlagIdCardBtn = false
             }
           }
             if (localStorage.getItem('baseInfoDtomobile')&&localStorage.getItem('baseInfoDtomobileID').replace(/^"([^"]*)"$/, '$1')===this.resiDetailObj.baseInfoDto.resiId) {
             const expiry = localStorage.getItem('data_expirymobile');
             if (expiry && Date.now() < parseInt(expiry)) {
               const name = JSON.parse(localStorage.getItem('baseInfoDtomobile'))
-              this.$set(this.resiDetailObj.baseInfoDto, "name", name);
-              this.showFlagnameBtn = false
+              this.$set(this.resiDetailObj.baseInfoDto, "mobile", name);
+              this.showFlagMobileBtn = false
             }
           }
         })