diff --git a/project/sanjianxi/AppNeighborLinkage/addLinkage.vue b/project/sanjianxi/AppNeighborLinkage/addLinkage.vue
index 5d8e50f..afd0699 100644
--- a/project/sanjianxi/AppNeighborLinkage/addLinkage.vue
+++ b/project/sanjianxi/AppNeighborLinkage/addLinkage.vue
@@ -3,7 +3,7 @@
 
     <div class="item">
       <div><span>*</span>四邻对象</div>
-      <AiSelect class="right" v-model="form.id" :list="userList"/>
+      <AiSelect class="right" v-model="form.residentId" :list="userList"/>
     </div>
 
     <div class="item">
@@ -44,7 +44,7 @@ export default {
       },
       isShowDate: false,
       form: {
-        id: '',
+        residentId: '',
         linksageDate: '',
         description: '',
       },
@@ -72,7 +72,7 @@ export default {
       })
     },
     confirm() {
-      if(!this.form.id) {
+      if(!this.form.residentId) {
         return this.$u.toast('请选择四邻对象')
       }
       if(!this.form.linksageDate) {
@@ -82,7 +82,7 @@ export default {
         return this.$u.toast('请输入事件描述')
       }
 
-      this.$instance.post('/app/apppartyfourlinkage/addOrUpdate',{
+      this.$instance.post('/app/apppartyfourlinkage/addByWxApplet',{
         ...this.form
       }).then(res => {
         if(res.code == 0) {
diff --git a/project/sanjianxi/AppNeighborLinkage/memberInfo.vue b/project/sanjianxi/AppNeighborLinkage/memberInfo.vue
index 47e9dac..2a39c05 100644
--- a/project/sanjianxi/AppNeighborLinkage/memberInfo.vue
+++ b/project/sanjianxi/AppNeighborLinkage/memberInfo.vue
@@ -2,14 +2,15 @@
   <div class="memberInfo">
     <div class="user">
       <div class="pic">
-        <img src="../static/avatar.png" alt="">
+        <img :src="data.photo" alt="" v-if="data.photo">
+        <img src="../static/avatar.png" alt="" v-else>
       </div>
       <div class="info">
-        <div class="name">李白</div>
-        <div class="idNumber">42068219980502252X</div>
+        <div class="name">{{ data.name }}</div>
+        <div class="idNumber">{{ data.idNumber.replace(/(.{6}).*(.{4})/, '$1********$2') }}</div>
       </div>
-      <div class="relation">
-        户主
+      <div class="relation" :style="{color:data.householdRelation == 11? '#4181FF' : '#999999' }">
+        {{ $dict.getLabel('householdRelation',data.householdRelation) }}
       </div>
     </div>
 
@@ -17,60 +18,57 @@
       <h2>个人基本信息</h2>
       <div class="items">
         <p>家庭住址</p>
-        <div>安徽省黄山市歙县郑村镇潭渡村黎明4组11</div>
+        <div>{{ data.householdAreaName }}</div>
       </div>
       <div class="item">
-        <span>身份证号</span><span>42068219980502252X</span>
+        <span>性别</span><span>{{ $dict.getLabel('sex',data.sex) }}</span>
       </div>
       <div class="item">
-        <span>性别</span><span>男</span>
+        <span>年龄</span><span>{{ data.age }}</span>
       </div>
       <div class="item">
-        <span>年龄</span><span>18</span>
+        <span>民族</span><span>{{ $dict.getLabel('nation',data.nation) }}</span>
       </div>
       <div class="item">
-        <span>民族</span><span>汉族</span>
+        <span>文化程度</span><span>{{ $dict.getLabel('education',data.education) }}</span>
       </div>
       <div class="item">
-        <span>文化程度</span><span>初中</span>
+        <span>婚姻状况</span><span>{{ $dict.getLabel('maritalStatus',data.maritalStatus) }}</span>
       </div>
       <div class="item">
-        <span>婚姻状况</span><span>未婚</span>
+        <span>政治面貌</span><span>{{ $dict.getLabel('politicsStatus',data.politicsStatus) }}</span>
       </div>
       <div class="item">
-        <span>政治面貌</span><span>党员</span>
+        <span>兵役状况</span><span>{{ $dict.getLabel('militaryStatus',data.militaryStatus) }}</span>
       </div>
       <div class="item">
-        <span>兵役状况</span><span>未服兵役</span>
+        <span>宗教信仰</span><span>{{ $dict.getLabel('faithType',data.faithType) }}</span>
       </div>
       <div class="item">
-        <span>宗教信仰</span><span>无</span>
-      </div>
-      <div class="item">
-        <span>职业</span><span>工人</span>
+        <span>职业</span><span>{{ $dict.getLabel('job',data.job) }}</span>
       </div>
     </div>
 
     <div class="contactInfo">
       <h2>联络信息</h2>
       <div class="item">
-        <span>联系方式</span><span>18571799417</span>
+        <span>联系方式</span><span>{{ data.phone }}</span>
       </div>
       <div class="items">
         <p>现住址</p>
-        <div>安徽省黄山市歙县郑村镇潭渡村黎明4组11</div>
+        <div>{{ data.currentAreaName }}</div>
       </div>
       <div class="items">
         <p>现住详细地址</p>
-        <div>安徽省黄山市歙县郑村镇潭渡村黎明4组11</div>
+        <div>{{ data.currentAddress }}</div>
       </div>
       <div class="items">
         <p>户籍地址</p>
-        <div>安徽省黄山市歙县郑村镇潭渡村黎明4组11</div>
+        <div>{{ data.householdAreaName }}</div>
       </div>
       <div class="items">
         <p>户籍详细地址</p>
-        <div>安徽省黄山市歙县郑村镇潭渡村黎明4组11安徽省黄山市歙县郑村镇潭渡村黎明4组11安徽省黄山市歙县郑村镇潭渡村黎明4组11安徽省黄山市歙县郑村镇潭渡村黎明4组11</div>
+        <div>{{ data.householdAddress }}</div>
       </div>
     </div>
   </div>
@@ -82,11 +80,28 @@ export default {
   appName: "家庭详情",
   data() {
     return {
-
+      id: '',
+      data: {},
     }
   },
-  onShow() {},
-  methods: {},
+  onLoad(o) {
+    this.$dict.load('sex','householdRelation','nation','education','maritalStatus','politicsStatus','faithType','job')
+    this.id = o.id
+    this.getUserInfo()
+  },
+  methods: {
+    getUserInfo() {
+      this.$instance.post('/app/appresident/detailForWx',null,{
+        params: {
+          id: this.id
+        }
+      }).then(res => {
+        if(res.code ==0) {
+          this.data = res.data.resident
+        }
+      })
+    },
+  },
 }
 </script>