Merge branch 'dev2.0' into dev_wy

@@ -552,6 +552,7 @@ Page({
         var setData = {}
         if (data.id_card_no && data.id_card_no.length) {
           setData.children_id_card_no = data.id_card_no
+          this.dealIdInfo(data.id_card_no, 'children_id_card_no_input')
         }
         if (data.name && data.name.length) {
           setData.children_name = data.name
@@ -601,6 +602,7 @@ Page({
         }
         if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
           setData.spouse_id_card_no = data.spouse_id_card_no
+          this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
         }
         if (this.data.loverbirthDate.selected.length) {
           var loverbirthDate = this.data.loverbirthDate
@@ -660,24 +662,17 @@ Page({
         break;
       case 'support_duty':
         var setData = {}
-        if (data.supported_name && data.supported_name.length) {
-          setData.supported_name = data.supported_name
-        }
-        if (data.percentage && data.percentage.length) {
-          setData.percentage = data.percentage
+        if (data.name && data.name.length) {
+          setData.supported_name = data.name
         }
         if (data.id_card_no && data.id_card_no.length) {
           setData.id_card_no = data.id_card_no
+          this.dealIdInfo(data.id_card_no, 'older_id_card_no_input')
         }
-        if (data.support_type && data.support_type.length) {
-          var supporttypeData = this.data.supporttypeData
-          supporttypeData.selected = data.support_type
-          setData.supporttypeData = supporttypeData
-        }
-        if (data.birthday && data.birthday.length) {
+        if (data.birth_date && data.birth_date.length) {
           var olderbirthDate = this.data.olderbirthDate
-          olderbirthDate.selected = format.formatTime_date(data.birthday)
-          olderbirthDate.datelong = data.birthday
+          olderbirthDate.selected = format.formatTime_date(data.birth_date)
+          olderbirthDate.datelong = data.birth_date
           setData.olderbirthDate = olderbirthDate
         }
         if (data.relationship && data.relationship.length) {
@@ -685,9 +680,6 @@ Page({
           older_relativeData.selected = data.relationship
           setData.older_relativeData = older_relativeData
         }
-        if (data.percentage && data.percentage.length) {
-          setData.percentage = data.percentage
-        }
         this.setData(setData)
         break;
       case 'medical_fund':
@@ -697,6 +689,7 @@ Page({
         }
         if (data.id_card_no && data.id_card_no.length) {
           setData.id_card_no = data.id_card_no
+          this.dealIdInfo(data.id_card_no, 'medical_id_card_no_input')
         }
         if (data.family_ties && data.family_ties.length) {
           var taxperson_relativeData = this.data.taxperson_relativeData
@@ -718,6 +711,7 @@ Page({
         }
         if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
           setData.spouse_id_card_no = data.spouse_id_card_no
+          this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
         }
         if (this.data.loverbirthDate.selected.length) {
           var loverbirthDate = this.data.loverbirthDate
@@ -875,6 +869,7 @@ Page({
 
           if (this.idcard_belong == 'children_id_card_no') {
             this.data.commonbirthDate.selected = birth_day
+            this.data.commonbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
             data = {
               children_id_card_no: id_info.id_card_number,
               children_name: id_info.name,
@@ -882,6 +877,7 @@ Page({
             }
           } else if (this.idcard_belong == 'spouse_id_card_no') {
             this.data.loverbirthDate.selected = birth_day
+            this.data.loverbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
             data = {
               spouse_id_card_no: id_info.id_card_number,
               spouse_name: id_info.name,
@@ -889,15 +885,18 @@ Page({
             }
           } else if (this.idcard_belong == 'older_id_card_no') {
             this.data.olderbirthDate.selected = birth_day
+            this.data.olderbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
             data = {
               id_card_no: id_info.id_card_number,
               supported_name: id_info.name,
               olderbirthDate: this.data.olderbirthDate
             }
-          } else if (this.idcard_belong == 'owner_id_card_no') {
-            this.data.olderbirthDate.selected = birth_day
+          } else if (this.idcard_belong == 'medical_id_card_no') {
+            this.data.commonbirthDate.selected = birth_day
+            this.data.commonbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
             data = {
-              owner_id_card_no: id_info.id_card_number,
+              id_card_no: id_info.id_card_number,
+              commonbirthDate: this.data.commonbirthDate
             }
           }
           this.setData(data)

@@ -169,7 +169,10 @@
   <view style='height:90rpx'>
     <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
     <text class='text_black_30 float_left'>病人证照号码</text>
-    <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证照号码' name='id_card_no' type='idcard' value='{{id_card_no}}' bindinput="idChange" id="medical_id_card_no_input"></input>
+    <view wx:if="{{isIdCard}}">
+      <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="medical_id_card_no"></image>
+      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;' placeholder='请输入证照号码' name='id_card_no' type='idcard' value='{{id_card_no}}' bindinput="idChange" id="medical_id_card_no_input"></input>
+    </view>
   </view>
   <view class='divide_line_f5f5f5'></view>
   <template is="picker_cell_normal" data="{{...commonbirthDate}}" />