diff --git a/subpages/addResi/pages/addResi/addResi.js b/subpages/addResi/pages/addResi/addResi.js
index ff3120e..daa94cd 100644
--- a/subpages/addResi/pages/addResi/addResi.js
+++ b/subpages/addResi/pages/addResi/addResi.js
@@ -42,7 +42,7 @@ Page({
         desc: '',
       },
     ], //步骤条数据
-    activeForm: 0,
+    activeForm: 2,
     /** 步骤条状态 */
     form: {
       baseInfoDto: {
@@ -167,8 +167,45 @@ Page({
       spouseSituationList: [], //配偶情况
       unemploymentReasonList: [], //失业原因
       employmentWishList: [], //就业意愿
-
+      genderList: [{ label: '男', value: '1' }, { label: '女', value: '2' }],
+      idTypeList : [
+        {
+          label: '其他',
+          value: 0
+        },
+        {
+          label: '身份证',
+          value: 1
+        },
+        {
+          label: '护照',
+          value: 2
+        },
+        {
+          label: '港澳通行证',
+          value: 3
+        },
+        {
+          label: '军人证',
+          value: 4
+        },
+        {
+          label: '台胞证',
+          value: 5
+        }
+      ],
+      binaryOptionList : [
+        {
+          label: '是',
+          value: 1
+        },
+        {
+          label: '否',
+          value: 0
+        }
+      ]
     },
+  
   },
 
   /**
@@ -601,7 +638,171 @@ Page({
             this.setData({
               'form.resideInfoDtos':this.data.form.resideInfoDtos
             })
-  }
+  },
   //**房屋逻辑end */
 
+  //**基础信息start */
+  bindNameInput(e){
+    this.setData({
+      ['form.baseInfoDto.name']: e.detail.value,
+    })
+  },
+  bindPickerChangeIdType(e){
+    const selectedIndex = e.detail.value;
+    const selectedVillage = this.data.dicts.idTypeList[selectedIndex]
+    this.setData({
+      idTypeName:selectedVillage.label,
+      'form.baseInfoDto.idType':selectedVillage.value
+    })
+  },
+  bindIdNumInput(e){
+    this.setData({
+      'form.baseInfoDto.name': e.detail.value,
+    })
+  },
+  bindPickerChangeNationality(e){
+    const selectedIndex = e.detail.value;
+    const selectedVillage = this.data.dicts.nationalityList[selectedIndex]
+    this.setData({
+      nationalityName:selectedVillage.label,
+      'form.baseInfoDto.nationality':selectedVillage.value
+    })
+  },
+  bindMobileInput(e){
+    this.setData({
+      'form.baseInfoDto.mobile': e.detail.value,
+    })
+  },
+  bindPickerChangeGender(){
+    this.setData({
+      genderName: this.data.genderList[e.detail.value].label,
+      "form.gender": this.data.genderList[e.detail.value].value
+    })
+  },
+  bindDateChange(e) {
+    this.setData({
+      'form.baseInfoDto.birthday': e.detail.value
+    })
+  },
+ 
+  bindPickerChangeNation(e) {
+    this.setData({
+      "form.baseInfoDto.nation": this.data.dicts.nationList[e.detail.value].value
+    })
+  },
+  bindPickerChangeEducation(e){
+    this.setData({
+      "form.eduInfoDto.cultureLevel": this.data.dicts.educationList[e.detail.value].value
+    })
+  },
+  bindPickerChangeMarriage(e) {
+    this.setData({
+      "form.familyInfoDto.marriage": this.data.dicts.marriageList[e.detail.value].value,
+      marriageName: this.data.dicts.marriageList[e.detail.value].label,
+    })
+  },
+  bindPickerChangeSpouse(e){
+    this.setData({
+      "form.familyInfoDto.spouseSituation": this.data.dicts.spouseSituationList[e.detail.value].value,
+      spouseSituationName: this.data.dicts.spouseSituationList[e.detail.value].label,
+    })
+  },
+  bindNativePlaceInput(e) {
+    this.setData({
+      'form.baseInfoDto.nativePlace': e.detail.value
+    })
+  },
+  bindLocalResidenceFlag(e){
+    this.setData({
+      'form.baseInfoDto.localResidenceFlag': e.detail.value
+    })
+  },
+  //**基础信息end */
+
+  //**拓展信息start */
+  bindReligionInput(e) {
+    this.setData({
+      "form.religionDto.religion": e.detail.value
+    })
+  },
+  bindCareerStatus(e){
+    this.setData({
+      "form.workInfoDto.careerStatus":this.data.dicts.careerStatusList[e.detail.value].value,
+      careerStatusName:this.data.dicts.careerStatusList[e.detail.value].label
+    })
+  },
+  bindWorkUnit(e){
+    this.setData({
+      "form.workInfoDto.workUnit": e.detail.value
+    })
+  },
+  bindWorkOccupation(e){
+    this.setData({
+      "form.workInfoDto.occupation": e.detail.value
+    })
+  },
+  bindMonthIncome(e){
+    this.setData({
+      "form.economyDto.monthIncome": e.detail.value
+    })
+  },
+  bindOriginWorkUnit(e){
+    this.setData({
+      "form.unemployedDto.originWorkUnit": e.detail.value
+    })
+  },
+  bindUnemploymentTime(e){
+    this.setData({
+      "form.unemployedDto.unemploymentTime": e.detail.value
+    })
+  },
+  bindUnemploymentNum(e){
+    this.setData({
+      "form.unemployedDto.unemploymentNum": e.detail.value
+    })
+  },
+  bindUnemploymentReason(e){
+    this.setData({
+      "form.unemployedDto.unemploymentReason":this.data.dicts.unemploymentReasonList[e.detail.value].value,
+      unemploymentReasonName:this.data.dicts.unemploymentReasonList[e.detail.value].label
+    })
+  },
+  bindEmploymentNum(e){
+    this.setData({
+      "form.unemployedDto.employmentNum": e.detail.value
+    })
+  },
+  bindSpecialSkill(e){
+    this.setData({
+      "form.unemployedDto.specialSkill": e.detail.value
+    })
+  },
+  bindUnempCompensationFlag(e){
+    this.setData({
+      "form.unemployedDto.unempCompensationFlag": Number(e.detail.value)
+    })
+  },
+  bindEmploymentHardFlag(e){
+    this.setData({
+      "form.unemployedDto.employmentHardFlag": Number(e.detail.value)
+    })
+  },
+  bindEmploymentWish(e){
+    this.setData({
+      "form.unemployedDto.employmentWish":this.data.dicts.employmentWishList[e.detail.value].value,
+      employmentWishName:this.data.dicts.employmentWishList[e.detail.value].label
+    })
+  },
+  bindElderlyRelation(e){
+    this.setData({
+      "form.familyInfoDto.elderlyRelation":this.data.dicts.houseHolderRelList[e.detail.value].value,
+      elderlyRelationName:this.data.dicts.houseHolderRelList[e.detail.value].label
+    })
+  },
+  bindDependantMobile(e){
+    this.setData({
+      "form.familyInfoDto.dependantMobile": e.detail.value
+    })
+  }
+  //**拓展信息end */
 })
\ No newline at end of file
diff --git a/subpages/addResi/pages/addResi/addResi.wxml b/subpages/addResi/pages/addResi/addResi.wxml
index 02c6543..ad58528 100644
--- a/subpages/addResi/pages/addResi/addResi.wxml
+++ b/subpages/addResi/pages/addResi/addResi.wxml
@@ -2,8 +2,8 @@
   <view class="form_card">
     <van-steps steps="{{ stepsList }}" custom-class="steps" inactive-color="" active-color="#3974f6" active="{{ activeForm }}"></van-steps>
   </view>
-  <view class="house_box"  wx:if="{{activeForm === 0}}">
-    <view class=" form_height_all" wx:for="{{form.resideInfoDtos}}"  class="form_card" style="margin-bottom: 20rpx;" wx:for-index="indexP">
+  <view class="house_box" wx:if="{{activeForm === 0}}">
+    <view class=" form_height_all" wx:for="{{form.resideInfoDtos}}" class="form_card" style="margin-bottom: 20rpx;" wx:for-index="indexP">
       <view class="title">
         <text class="tag"></text> 选择居住房屋{{indexP+1}}
       </view>
@@ -41,7 +41,7 @@
           <view class="title">所在楼栋</view>
         </view>
         <view class="input">
-          <picker bindchange="bindPickerChangebuilding" range-key="label" value="{{index}}" range="{{form.resideInfoDtos[indexP].optionsB}}"  data-indexP="{{indexP}}">
+          <picker bindchange="bindPickerChangebuilding" range-key="label" value="{{index}}" range="{{form.resideInfoDtos[indexP].optionsB}}" data-indexP="{{indexP}}">
             <view class="{{form.resideInfoDtos[indexP].buildingName?'':'gray'}}">
               {{form.resideInfoDtos[indexP].buildingName ? form.resideInfoDtos[indexP].buildingName : '请选择'}}
             </view>
@@ -55,7 +55,7 @@
           <view class="title">所在单元</view>
         </view>
         <view class="input">
-          <picker bindchange="bindPickerChangeUnit" range-key="label" value="{{index}}"  range="{{form.resideInfoDtos[indexP].optionsD}}"  data-indexP="{{indexP}}">
+          <picker bindchange="bindPickerChangeUnit" range-key="label" value="{{index}}" range="{{form.resideInfoDtos[indexP].optionsD}}" data-indexP="{{indexP}}">
             <view class="{{form.resideInfoDtos[indexP].unitName?'':'gray'}}">
               {{form.resideInfoDtos[indexP].unitName ? form.resideInfoDtos[indexP].unitName : '请选择'}}
             </view>
@@ -82,7 +82,7 @@
           <view class="title">人房关系</view>
         </view>
         <view class="input">
-          <picker bindchange="bindPickerChangeResiHouseRel" range-key="label" value="{{index}}" range="{{resiHouseRelList}}"  data-indexP="{{indexP}}">
+          <picker bindchange="bindPickerChangeResiHouseRel" range-key="label" value="{{index}}" range="{{resiHouseRelList}}" data-indexP="{{indexP}}">
             <view class="{{form.resideInfoDtos[indexP].resiHouseRelName?'':'gray'}}">
               {{form.resideInfoDtos[indexP].resiHouseRelName ? form.resideInfoDtos[indexP].resiHouseRelName : '请选择'}}
             </view>
@@ -96,7 +96,7 @@
           <view class="title">与户主关系</view>
         </view>
         <view class="input">
-          <picker bindchange="bindPickerChangehouseHolderRel" range-key="label" value="{{index}}" range="{{dicts.houseHolderRelList}}"  data-indexP="{{indexP}}">
+          <picker bindchange="bindPickerChangehouseHolderRel" range-key="label" value="{{index}}" range="{{dicts.houseHolderRelList}}" data-indexP="{{indexP}}">
             <view class="{{form.resideInfoDtos[indexP].houseHolderRelName?'':'gray'}}">
               {{form.resideInfoDtos[indexP].houseHolderRelName ? form.resideInfoDtos[indexP].houseHolderRelName : '请选择'}}
             </view>
@@ -104,14 +104,13 @@
           <image src="../../../../images/right.png" mode="" />
         </view>
       </view>
-    
+
       <view class="form_item">
         <view class="label ">
           <view class="title">户籍所在地</view>
         </view>
         <view class="input">
-          <input confirm-type="next" bindblur="bindPlaceOfDomicileInput" bindinput="bindPlaceOfDomicileInput"value="{{form.resideInfoDtos[indexP].placeOfDomicile}}"  placeholder-class="gray" placeholder="请输入" data-indexP="{{indexP}}" />
-          <image src="../../../../images/right.png" mode="" />
+          <input confirm-type="next" bindblur="bindPlaceOfDomicileInput" bindinput="bindPlaceOfDomicileInput" value="{{form.resideInfoDtos[indexP].placeOfDomicile}}" placeholder-class="gray" placeholder="请输入" data-indexP="{{indexP}}" />
         </view>
       </view>
 
@@ -120,18 +119,16 @@
           <view class="title">现居住地址</view>
         </view>
         <view class="input">
-          <input confirm-type="next" bindblur="bindCurrentResidenceInput" bindinput="bindCurrentResidenceInput" value="{{form.resideInfoDtos[indexP].currentResidence}}" placeholder-class="gray" placeholder="请输入"  data-indexP="{{indexP}}"/>
-          <image src="../../../../images/right.png" mode="" />
+          <input confirm-type="next" bindblur="bindCurrentResidenceInput" bindinput="bindCurrentResidenceInput" value="{{form.resideInfoDtos[indexP].currentResidence}}" placeholder-class="gray" placeholder="请输入" data-indexP="{{indexP}}" />
         </view>
       </view>
 
       <view class="form_item">
         <view class="label ">
-          <text class="must">*</text>
           <view class="title">迁出时间</view>
         </view>
         <view class="input">
-          <picker mode="date" value="{{form.resideInfoDtos[indexP].outOfTime}}" end="{{day}}" bindchange="bindOutOfTimeChange"  data-indexP="{{indexP}}">
+          <picker mode="date" value="{{form.resideInfoDtos[indexP].outOfTime}}" end="{{day}}" bindchange="bindOutOfTimeChange" data-indexP="{{indexP}}">
             <view class="{{form.resideInfoDtos[indexP].outOfTime?'':'gray'}}">
               {{form.resideInfoDtos[indexP].outOfTime ? form.resideInfoDtos[indexP].outOfTime : '请选择'}}
             </view>
@@ -140,8 +137,8 @@
         </view>
       </view>
       <view class="house_btn">
-      <button bind:tap="addHouse">+</button>
-      <button  bind:tap="delHouse" data-indexP="{{indexP}}" wx:if="{{form.resideInfoDtos.length>1}}">-</button>
+        <button bind:tap="addHouse">+</button>
+        <button bind:tap="delHouse" data-indexP="{{indexP}}" wx:if="{{form.resideInfoDtos.length>1}}">-</button>
 
       </view>
 
@@ -149,13 +146,16 @@
   </view>
 
   <view class="form_card form_height" wx:if="{{activeForm === 1}}">
+    <view class="title">
+      <text class="tag"></text> 基础信息登记
+    </view>
     <view class="form_item">
       <view class="label">
         <text class="must">*</text>
         <view class="title">姓名</view>
       </view>
       <view class="input">
-        <input confirm-type="next" bindblur="bindNameInput" bindinput="bindNameInput" value="{{form.name}}" placeholder-class="gray" placeholder="请输入" />
+        <input confirm-type="next" bindblur="bindNameInput" bindinput="bindNameInput" value="{{form.baseInfoDto.name}}" placeholder-class="gray" placeholder="请输入" />
       </view>
     </view>
 
@@ -165,9 +165,9 @@
         <view class="title">证件类型</view>
       </view>
       <view class="input">
-        <picker bindchange="" range-key="label" value="{{index}}" range="{{}}">
+        <picker bindchange="bindPickerChangeIdType" range-key="label" value="{{index}}" range="{{dicts.idTypeList}}">
           <view class="{{form.baseInfoDto.idType?'':'gray'}}">
-            {{genderName ? genderName : '请选择'}}
+            {{idTypeName ? idTypeName : '请选择'}}
           </view>
         </picker>
         <image src="../../../../images/right.png" mode="" />
@@ -180,8 +180,7 @@
         <view class="title">证件号</view>
       </view>
       <view class="input">
-        <input confirm-type="next" bindblur="bindIdNumInput" bindinput="bindidNumInput" value="{{form.idNum}}" placeholder-class="gray" placeholder="请输入" />
-
+        <input confirm-type="next" bindblur="bindIdNumInput" bindinput="bindidNumInput" value="{{form.baseInfoDto.idNum}}" placeholder-class="gray" placeholder="请输入" />
       </view>
     </view>
 
@@ -191,9 +190,9 @@
         <view class="title">国籍</view>
       </view>
       <view class="input">
-        <picker bindchange="" range-key="label" value="{{index}}" range="{{}}">
-          <view class="{{form.baseInfoDto.idType?'':'gray'}}">
-            {{genderName ? genderName : '请选择'}}
+        <picker bindchange="bindPickerChangeNationality" range-key="label" value="{{index}}" range="{{dicts.nationalityList}}">
+          <view class="{{nationalityName?'':'gray'}}">
+            {{nationalityName ? nationalityName : '请选择'}}
           </view>
         </picker>
         <image src="../../../../images/right.png" mode="" />
@@ -218,8 +217,8 @@
         <view class="title">性别</view>
       </view>
       <view class="input">
-        <picker bindchange="bindPickerChangeGender" range-key="label" value="{{index}}" range="{{genderList}}">
-          <view class="{{form.gender?'':'gray'}}">
+        <picker bindchange="bindPickerChangeGender" range-key="label" value="{{index}}" range="{{dicts.genderList}}">
+          <view class="{{genderName?'':'gray'}}">
             {{genderName ? genderName : '请选择'}}
           </view>
         </picker>
@@ -247,9 +246,9 @@
         <view class="title">民族</view>
       </view>
       <view class="input">
-        <picker bindchange="bindPickerChangeNation" range-key="label" value="{{index}}" range="{{nation}}">
-          <view class="{{form.nation?'':'gray'}}">
-            {{form.nation ? nation[form.nation].label : '请选择'}}
+        <picker bindchange="bindPickerChangeNation" range-key="label" value="{{index}}" range="{{dicts.nationList}}">
+          <view class="{{form.baseInfoDto.nation?'':'gray'}}">
+            {{form.baseInfoDto.nation ? dicts.nationList[form.baseInfoDto.nation].label : '请选择'}}
           </view>
         </picker>
         <image src="../../../../images/right.png" mode="" />
@@ -260,9 +259,9 @@
         <view class="title">文化程度</view>
       </view>
       <view class="input">
-        <picker bindchange="bindPickerChangeEducation" range-key="label" value="{{index}}" range="{{education}}">
+        <picker bindchange="bindPickerChangeEducation" range-key="label" value="{{index}}" range="{{dicts.educationList}}">
           <view class="{{form.eduInfoDto.cultureLevel?'':'gray'}}">
-            {{form.eduInfoDto.cultureLevel ? education[form.eduInfoDto.cultureLevel].label : '请选择'}}
+            {{form.eduInfoDto.cultureLevel ? dicts.educationList[form.eduInfoDto.cultureLevel].label : '请选择'}}
           </view>
         </picker>
         <image src="../../../../images/right.png" mode="" />
@@ -273,8 +272,8 @@
         <view class="title">婚姻状况</view>
       </view>
       <view class="input">
-        <picker bindchange="bindPickerChangemarriage" range-key="label" value="{{index}}" range="{{marriageList}}">
-          <view class="{{form.familyInfoDto.marriage?'':'gray'}}">
+        <picker bindchange="bindPickerChangeMarriage" range-key="label" value="{{index}}" range="{{dicts.marriageList}}">
+          <view class="{{marriageName?'':'gray'}}">
             {{marriageName ? marriageName : '请选择'}}
           </view>
         </picker>
@@ -286,9 +285,9 @@
         <view class="title">配偶情况</view>
       </view>
       <view class="input">
-        <picker bindchange="" range-key="label" value="{{index}}" range="{{}}">
-          <view class="{{form.familyInfoDto.marriage?'':'gray'}}">
-            {{marriageName ? marriageName : '请选择'}}
+        <picker bindchange="bindPickerChangeSpouse" range-key="label" value="{{index}}" range="{{dicts.spouseSituationList}}">
+          <view class="{{spouseSituationName?'':'gray'}}">
+            {{spouseSituationName ? spouseSituationName : '请选择'}}
           </view>
         </picker>
         <image src="../../../../images/right.png" mode="" />
@@ -300,7 +299,7 @@
         <view class="title">籍贯</view>
       </view>
       <view class="input">
-        <input confirm-type="next" bindblur="bindNativePlaceInput" bindinput="bindNativePlaceInput" value="{{form.resideInfoDto.nativePlace}}" placeholder-class="gray" placeholder="请输入" />
+        <input confirm-type="next" bindblur="bindNativePlaceInput" bindinput="bindNativePlaceInput" value="{{form.baseInfoDto.nativePlace}}" placeholder-class="gray" placeholder="请输入" />
       </view>
     </view>
 
@@ -309,9 +308,9 @@
         <view class="title">本地户籍</view>
       </view>
       <view class="input">
-        <picker bindchange="" range-key="label" value="{{index}}" range="{{}}">
-          <view class="{{form.familyInfoDto.marriage?'':'gray'}}">
-            {{marriageName ? marriageName : '请选择'}}
+        <picker bindchange="bindLocalResidenceFlag" range-key="label" value="{{index}}" range="{{dicts.binaryOptionList}}">
+          <view class="{{form.baseInfoDto.localResidenceFlag?'':'gray'}}">
+            {{form.baseInfoDto.localResidenceFlag ?dicts.binaryOptionList[form.baseInfoDto.localResidenceFlag].label  : '请选择'}}
           </view>
         </picker>
         <image src="../../../../images/right.png" mode="" />
@@ -320,25 +319,26 @@
   </view>
 
   <view wx:if="{{activeForm === 2}}" class="form_card form_height">
+    <view class="title">
+      <text class="tag"></text> 拓展信息登记
+    </view>
     <view class="form_item">
       <view class="label">
-        <!-- <text class="must">*</text> -->
         <view class="title">宗教信仰</view>
       </view>
       <view class="input">
-        <input confirm-type="next" bindblur="" bindinput="" value="{{}}" placeholder-class="gray" placeholder="请输入" />
+        <input confirm-type="next" bindblur="bindReligionInput" bindinput="bindReligionInput" value="{{form.religionDto.religion}}" placeholder-class="gray" placeholder="请输入" />
       </view>
     </view>
 
     <view class="form_item">
       <view class="label">
-        <!-- <text class="must">*</text> -->
         <view class="title">就业状态</view>
       </view>
       <view class="input">
-        <picker bindchange="" range-key="label" value="{{index}}" range="{{}}">
-          <view class="{{form.baseInfoDto.idType?'':'gray'}}">
-            {{genderName ? genderName : '请选择'}}
+        <picker bindchange="bindCareerStatus" range-key="label" value="{{index}}" range="{{dicts.careerStatusList}}">
+          <view class="{{form.workInfoDto.careerStatus?'':'gray'}}">
+            {{careerStatusName ? careerStatusName : '请选择'}}
           </view>
         </picker>
         <image src="../../../../images/right.png" mode="" />
@@ -350,7 +350,7 @@
         <view class="title">工作单位</view>
       </view>
       <view class="input">
-        <input confirm-type="next" bindblur="" bindinput="" value="{{}}" placeholder-class="gray" placeholder="请输入" />
+        <input confirm-type="next" bindblur="bindWorkUnit" bindinput="bindWorkUnit" value="{{form.workInfoDto.workUnit}}" placeholder-class="gray" placeholder="请输入" />
       </view>
     </view>
 
@@ -359,7 +359,7 @@
         <view class="title">职业</view>
       </view>
       <view class="input">
-        <input confirm-type="next" bindblur="" bindinput="" value="{{}}" placeholder-class="gray" placeholder="请输入" />
+        <input confirm-type="next" bindblur="bindWorkOccupation" bindinput="bindWorkOccupation" value="{{form.workInfoDto.occupation}}" placeholder-class="gray" placeholder="请输入" />
       </view>
     </view>
 
@@ -368,7 +368,7 @@
         <view class="title">月收入</view>
       </view>
       <view class="input">
-        <input confirm-type="next" bindblur="" bindinput="" value="{{}}" placeholder-class="gray" placeholder="请输入" />
+        <input confirm-type="next" bindblur="bindMonthIncome" bindinput="bindMonthIncome" value="{{form.economyDto.monthIncome}}" placeholder-class="gray" placeholder="请输入" />
       </view>
     </view>
 
@@ -377,7 +377,7 @@
         <view class="title">原工作单位</view>
       </view>
       <view class="input">
-        <input confirm-type="next" bindblur="" bindinput="" value="{{}}" placeholder-class="gray" placeholder="请输入" />
+        <input confirm-type="next" bindblur="bindOriginWorkUnit" bindinput="bindOriginWorkUnit" value="{{form.unemployedDto.originWorkUnit}}" placeholder-class="gray" placeholder="请输入" />
       </view>
     </view>
 
@@ -387,9 +387,9 @@
         <view class="title">失业时间</view>
       </view>
       <view class="input">
-        <picker mode="date" value="{{}}" end="{{day}}" bindchange="bindDateChange">
-          <view class="{{form.birthday?'':'gray'}}">
-            {{form.birthday ? form.birthday : '请选择'}}
+        <picker mode="date" value="{{form.unemployedDto.unemploymentTime}}" end="{{day}}" bindchange="bindUnemploymentTime">
+          <view class="{{form.unemployedDto.unemploymentTime?'':'gray'}}">
+            {{form.unemployedDto.unemploymentTime ? form.unemployedDto.unemploymentTime : '请选择'}}
           </view>
         </picker>
         <image src="../../../../images/right.png" mode="" />
@@ -401,7 +401,7 @@
         <view class="title">失业证号</view>
       </view>
       <view class="input">
-        <input confirm-type="next" bindblur="" bindinput="" value="{{}}" placeholder-class="gray" placeholder="请输入" />
+        <input confirm-type="next" bindblur="bindUnemploymentNum" bindinput="bindUnemploymentNum" value="{{form.unemployedDto.unemploymentNum}}" placeholder-class="gray" placeholder="请输入" />
       </view>
     </view>
 
@@ -410,9 +410,9 @@
         <view class="title">失业原因</view>
       </view>
       <view class="input">
-        <picker bindchange="" range-key="label" value="{{index}}" range="{{}}">
-          <view class="{{form.baseInfoDto.idType?'':'gray'}}">
-            {{genderName ? genderName : '请选择'}}
+        <picker bindchange="bindUnemploymentReason" range-key="label" value="{{index}}" range="{{dicts.unemploymentReasonList}}">
+          <view class="{{form.unemployedDto.unemploymentReason?'':'gray'}}">
+            {{unemploymentReasonName ? unemploymentReasonName : '请选择'}}
           </view>
         </picker>
         <image src="../../../../images/right.png" mode="" />
@@ -424,7 +424,7 @@
         <view class="title">再就业优惠证号</view>
       </view>
       <view class="input">
-        <input confirm-type="next" bindblur="" bindinput="" value="{{}}" placeholder-class="gray" placeholder="请输入" />
+        <input confirm-type="next" bindblur="bindEmploymentNum" bindinput="bindEmploymentNum" value="{{form.unemployedDto.employmentNum}}" placeholder-class="gray" placeholder="请输入" />
       </view>
     </view>
 
@@ -433,7 +433,7 @@
         <view class="title">技术特长</view>
       </view>
       <view class="input">
-        <input confirm-type="next" bindblur="" bindinput="" value="{{}}" placeholder-class="gray" placeholder="请输入" />
+        <input confirm-type="next" bindblur="bindSpecialSkill" bindinput="bindSpecialSkill" value="{{form.unemployedDto.specialSkill}}" placeholder-class="gray" placeholder="请输入" />
       </view>
     </view>
 
@@ -442,7 +442,7 @@
         <view class="title">是否领取失业金</view>
       </view>
       <view class="input">
-        <radio-group class="radio_group" bindchange="">
+        <radio-group class="radio_group" bindchange="bindUnempCompensationFlag">
           <radio value="1" checked="true" color="#3974f6" />是
           <radio value="0" checked="true" color="#3974f6" />否
         </radio-group>
@@ -454,7 +454,7 @@
         <view class="title">是否就业困难对象</view>
       </view>
       <view class="input">
-        <radio-group class="radio_group" bindchange="">
+        <radio-group class="radio_group" bindchange="bindEmploymentHardFlag">
           <radio value="1" checked="true" color="#3974f6" />是
           <radio value="0" checked="true" color="#3974f6" />否
         </radio-group>
@@ -466,9 +466,9 @@
         <view class="title">劳动就业愿望</view>
       </view>
       <view class="input">
-        <picker bindchange="" range-key="label" value="{{index}}" range="{{}}">
-          <view class="{{form.baseInfoDto.idType?'':'gray'}}">
-            {{genderName ? genderName : '请选择'}}
+        <picker bindchange="bindEmploymentWish" range-key="label" value="{{index}}" range="{{dicts.employmentWishList}}">
+          <view class="{{form.unemployedDto.employmentWish?'':'gray'}}">
+            {{employmentWishName ? employmentWishName : '请选择'}}
           </view>
         </picker>
         <image src="../../../../images/right.png" mode="" />
@@ -486,38 +486,65 @@
         </radio-group>
       </view>
     </view>
-  </view>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    <view class="form_item">
+      <view class="label">
+        <view class="title">与赡养人关系</view>
+      </view>
+      <view class="input">
+        <picker bindchange="bindElderlyRelation" range-key="label" value="{{index}}" range="{{dicts.houseHolderRelList}}">
+          <view class="{{form.familyInfoDto.elderlyRelation?'':'gray'}}">
+            {{elderlyRelationName ? elderlyRelationName : '请选择'}}
+          </view>
+        </picker>
+        <image src="../../../../images/right.png" mode="" />
+      </view>
+    </view>
 
+    <view class="form_item">
+      <view class="label">
+        <view class="title">赡养人联系电话</view>
+      </view>
+      <view class="input">
+        <input confirm-type="next" bindblur="bindDependantMobile" bindinput="bindDependantMobile" value="{{form.familyInfoDto.dependantMobile}}" placeholder-class="gray" placeholder="请输入" />
+      </view>
+    </view>
+  </view>
+  <view wx:if="{{activeForm == 3}}" class="form_height">
+    <view class="form_card">
+      <view class="title">
+        <text class="tag"></text> 人员标签
+      </view>
+      <view class="form_item">
+        <view class="label">
+          <view class="title">政治面貌</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindUnempCompensationFlag">
+            <radio value="1" checked="true" color="#3974f6" />群众
+            <radio value="0" checked="true" color="#3974f6" />党员
+            <radio value="0" checked="true" color="#3974f6" />共青团员
+          </radio-group>
+        </view>
+      </view>
+    </view>
+    <view class="form_card">
+      <view class="title">
+        <text class="tag"></text> 健康状况
+      </view>
+      <view class="form_item">
+        <view class="label">
+          <view class="title">残疾</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+          
+        </view>
+      </view>
+    </view>
+  </view>
 
 </view>
 <view class="bot_btn">
diff --git a/subpages/addResi/pages/addResi/addResi.wxss b/subpages/addResi/pages/addResi/addResi.wxss
index f1da2d6..8e6ee3f 100644
--- a/subpages/addResi/pages/addResi/addResi.wxss
+++ b/subpages/addResi/pages/addResi/addResi.wxss
@@ -86,7 +86,7 @@ page {
 .form_card .form_item{
     display: flex;
     align-items: center;
-    border-bottom: 1px solid #EAEAEA;
+    border-top: 1px solid #EAEAEA;
     height: 100rpx;
 }
 .form_card .form_item .label{
@@ -135,6 +135,7 @@ page {
     width: 100%;
     display: flex;
     justify-content: space-around;
+    align-items: center;
 }
 .bot_btn{
     display: flex;
diff --git a/subpages/searchResult/pages/searchResult/searchResult.js b/subpages/searchResult/pages/searchResult/searchResult.js
index 0bee7e4..ade6e01 100644
--- a/subpages/searchResult/pages/searchResult/searchResult.js
+++ b/subpages/searchResult/pages/searchResult/searchResult.js
@@ -1,5 +1,5 @@
 // subpages/searchResult/pages/searchResult/searchResult.js
-import  {getCommunityHouse,getResidentBaseInfo} from "../../../../utils/api"
+import  {getCommunityHouse,getResidentBaseInfoPage} from "../../../../utils/api"
 const app = getApp()
 Page({
 
@@ -91,12 +91,12 @@ Page({
             loadMoreType: "more",
           })
         let parm ={
-            searchKey:this.data.keyWord,
+            name:this.data.keyWord,
             pageSize:this.data.pageSize,
             pageNo:this.data.pageNo
         }
         if(this.data.type == 'resi'){
-            getResidentBaseInfo(parm).then(res=>{
+          getResidentBaseInfoPage(parm).then(res=>{
                 this.setData({
                     loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none',
                     tableData: this.data.tableData.concat(res.data.list),