Merge remote-tracking branch 'origin/dev' into dev

project/sanjianxi/AppNeighborLinkage/AppNeighborLinkage.vue

@@ -72,7 +72,6 @@ export default {
       this.getList()
     })
     this.getList()
-    this.getUserInfo()
   },
   methods: {
     search(e) {

project/sanjianxi/AppNeighborLinkage/memberInfo.vue

@@ -7,7 +7,7 @@
       </div>
       <div class="info">
         <div class="name">{{ data.name }}</div>
-        <div class="idNumber">{{ data.idNumber.replace(/(.{6}).*(.{4})/, '$1********$2') }}</div>
+        <div class="idNumber">{{ String(data.householdIdNumber).replace(/(.{6}).*(.{4})/, '$1********$2') }}</div>
       </div>
       <div class="relation" :style="{color:data.householdRelation == 11? '#4181FF' : '#999999' }">
         {{ $dict.getLabel('householdRelation',data.householdRelation) }}
@@ -84,10 +84,14 @@ export default {
       data: {},
     }
   },
+
+  onShow() {
+    this.getUserInfo()
+  },
+
   onLoad(o) {
     this.$dict.load('sex','householdRelation','nation','education','maritalStatus','politicsStatus','faithType','job')
     this.id = o.id
-    this.getUserInfo()
   },
   methods: {
     getUserInfo() {
@@ -97,6 +101,7 @@ export default {
         }
       }).then(res => {
         if(res.code ==0) {
+          console.log(res);
           this.data = res.data.resident
         }
       })

project/sanjianxi/AppNeighborLinkage/neighborDetail.vue

@@ -73,6 +73,8 @@ export default {
 
 <style lang="scss" scoped>
 .neighborDetail {
+  padding-bottom: 140px;
+  box-sizing: border-box;
   .type {
     display: flex;
     justify-content: space-between;