Merge branch 'release' of http://121.42.41.42:7070/r/epdc-resident-mp-yushan into release

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> -->
 
 
   <!-- 拨打电话 -->

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,

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>
@@ -246,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>