From 98ce8704a1058c5353209c58207310ad622ad389 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 26 Jul 2022 11:10:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=B6=E5=BA=AD=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?unitid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-resident-mp-yushan/app.json                  |  3 +++
 .../pages/toRegister/toRegister.js                |  2 +-
 .../family/pages/familyInfo/familyInfo.js         | 15 +++++++++------
 .../subpages/family/pages/index/index.js          |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/epdc-resident-mp-yushan/app.json b/epdc-resident-mp-yushan/app.json
index 8f14304..951e75f 100644
--- a/epdc-resident-mp-yushan/app.json
+++ b/epdc-resident-mp-yushan/app.json
@@ -18,6 +18,9 @@
     "pages/gridLeaderRegister/gridLeaderRegister",
     "pages/property/property"
   ],
+  "requiredPrivateInfos": [
+    "getLocation"
+  ],
   "subPackages": [
     {
       "root": "subpages/home",
diff --git a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
index 9d593e2..152e844 100644
--- a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
+++ b/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'
diff --git a/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.js b/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.js
index 8d760b3..abc3698 100644
--- a/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.js
+++ b/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)
diff --git a/epdc-resident-mp-yushan/subpages/family/pages/index/index.js b/epdc-resident-mp-yushan/subpages/family/pages/index/index.js
index 3e2c5a6..e512ae0 100644
--- a/epdc-resident-mp-yushan/subpages/family/pages/index/index.js
+++ b/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
     })
   },
   // 取消编辑