From 6e6546601a4d7b3d08501861976e9cd5104fdf5f Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Wed, 15 Jun 2022 16:22:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B0=91=E6=97=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subpages/family/pages/familyInfo/familyInfo.js           | 5 +++++
 .../subpages/family/pages/familyInfo/familyInfo.wxml         | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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 041cc89..d23863b 100644
--- a/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.js
+++ b/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.js
@@ -90,6 +90,11 @@ Page({
       'fmData.mobile' : e.detail.value
     })
   },
+  nationSync(e){
+    this.setData({
+      'fmData.nation' : e.detail.value
+    })
+  },
   nationSyncPicker(e){
     this.setData({
       'fmData.nationValue' : this.data.nationList[e.detail.value].dictValue,
diff --git a/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml b/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml
index 8f5d765..0f114f9 100644
--- a/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml
+++ b/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml
@@ -121,7 +121,9 @@
             </view>
             <view class="value">
               <view class="input">
-                <input type="text" value="{{ fmData.nation }}" placeholder="请输入民族" placeholder-class="z-ph" data-fm="fmData" data-name="nation" cursor-spacing="14" maxlength="100" />
+                <input type="text" value="{{ fmData.nation }}" placeholder="请输入民族" 
+                bindinput="nationSync"
+                placeholder-class="z-ph" data-fm="fmData" data-name="nation" cursor-spacing="14" maxlength="100" />
               </view>
             </view>
           </view>

From dd1dcd6e458256503c276237dfdfbb7aeddabadf Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 16 Jun 2022 09:19:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=80=8F=E6=98=8E=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-resident-mp-yushan/pages/index/index.wxml                  | 2 +-
 .../subpages/family/pages/familyInfo/familyInfo.wxml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epdc-resident-mp-yushan/pages/index/index.wxml b/epdc-resident-mp-yushan/pages/index/index.wxml
index c2655e4..6d34d96 100644
--- a/epdc-resident-mp-yushan/pages/index/index.wxml
+++ b/epdc-resident-mp-yushan/pages/index/index.wxml
@@ -159,7 +159,7 @@
   <move-btn wx:if="{{vaccinationSwitch}}" button-width="142" button-height="164" button-left="620" area-top="120" area-height="80%" img-url="../../images/vaccines.png" bindmovebtnCallBack="toVaccines"></move-btn>
   
   <!-- 测试使用 -->
-  <move-btn wx:if="{{vaccinationSwitch}}" button-width="100" button-height="80" button-left="620" area-top="120" area-height="65%" img-url="../../images/logo.png" bindmovebtnCallBack="toFamily"></move-btn>
+  <!-- <move-btn wx:if="{{vaccinationSwitch}}" button-width="100" button-height="80" button-left="620" area-top="120" area-height="65%" img-url="../../images/logo.png" bindmovebtnCallBack="toFamily"></move-btn> -->
 
 
   <!-- 拨打电话 -->
diff --git a/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml b/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml
index 0f114f9..c876cba 100644
--- a/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml
+++ b/epdc-resident-mp-yushan/subpages/family/pages/familyInfo/familyInfo.wxml
@@ -248,7 +248,7 @@
       </view>
     </view>
     <view class="operate" wx:if="{{pageType === 'add'}}">
-      <view class="btn {{ submitBtnIsAllowed ? '' : 'z-disabled'}}" bind:tap="submit">确认提交</view>
+      <view class="btn" style="opacity: 1;" bind:tap="submit">确认提交</view>
     </view>
     <view class="edit" wx:if="{{pageType === 'look'}}">
       <view class="editbtn" bindtap="editTap">编辑</view>

From 00fb4f3d350d4f81cf9e460b01e284895e67306e Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 16 Jun 2022 15:51:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=E7=BB=91=E5=AE=9A=E6=88=BF?=
 =?UTF-8?q?=E5=B1=8B=E6=97=B6=E8=B7=AF=E7=89=8C=E5=8F=B7=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subpages/family/pages/bindFamily/bindFamily.js              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.js b/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.js
index e8c744f..dfdf2bf 100644
--- a/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.js
+++ b/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.js
@@ -584,7 +584,7 @@ Page({
       return
     }
     if (!this.data.fmData.road) {
-      this.showToast('请填写所在街道')
+      this.showToast('请填写路牌号')
       return false
     }
     const houseAddress = this.data.houseInfo.gridName + '-'