修改家庭成员信息增加参数unitid

epdc-resident-mp-yushan/app.json

@@ -18,6 +18,9 @@
     "pages/gridLeaderRegister/gridLeaderRegister",
     "pages/property/property"
   ],
+  "requiredPrivateInfos": [
+    "getLocation"
+  ],
   "subPackages": [
     {
       "root": "subpages/home",

epdc-resident-mp-yushan/pages/toRegister/toRegister.js

@@ -21,7 +21,7 @@ Page({
       }
     })
     let that = this
-    const versionNum = '1.2.35'
+    const versionNum = '1.2.36'
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data ? res.data.scanFlag : '1'

epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.js

@@ -30,7 +30,8 @@ Page({
         needAudit:'1',
     },
     nationList: [],
-    houseRelationList: []
+    houseRelationList: [],
+    unitId: '', // 房屋id
   },
 
   /**
@@ -40,13 +41,14 @@ Page({
     wx.showLoading({
       title: "加载中",
       mask: true,
-    });
+    })
-    let idCard = options.idCard
+    
     this.setData({
-      pageType:options.pageType
+      pageType: options.pageType,
+      unitId: options.id
     })
     if(options.pageType !== 'add'){
-      await this.getMemberInfo(idCard)
+      await this.getMemberInfo(options.idCard)
     }else{
       this.setData({
         'fmData.unitId':options.id
@@ -61,7 +63,8 @@ Page({
     if(res.msg === 'success' && res.code === 0){
       if (res.data) {
         this.setData({
-          'fmData':res.data,
+          'fmData': res.data,
+          'fmData.unitId': this.data.unitId
         })
         if (idCard) {
           this.handleValidBlur('',idCard)

epdc-resident-mp-yushan/subpages/family/pages/index/index.js

@@ -70,7 +70,7 @@ Page({
   // 跳转查看页面
   toFamilyInfo(e){
     wx.navigateTo({
-      url: '/subpages/family/pages/familyInfo/familyInfo?pageType=look&idCard='+ e.currentTarget.dataset.id
+      url: '/subpages/family/pages/familyInfo/familyInfo?pageType=look&idCard='+ e.currentTarget.dataset.id + '&id='+ this.data.familyInfo.id
     })
   },
   // 取消编辑