提交 056ad94a4dc8b76fbdf2e887bae455b52f6f07be

作者 wangyu
2 个父辈 fea74552 44e19db7

Merge branch 'dev2.0' into dev_wy

@@ -552,6 +552,7 @@ Page({ @@ -552,6 +552,7 @@ Page({
552 var setData = {} 552 var setData = {}
553 if (data.id_card_no && data.id_card_no.length) { 553 if (data.id_card_no && data.id_card_no.length) {
554 setData.children_id_card_no = data.id_card_no 554 setData.children_id_card_no = data.id_card_no
  555 + this.dealIdInfo(data.id_card_no, 'children_id_card_no_input')
555 } 556 }
556 if (data.name && data.name.length) { 557 if (data.name && data.name.length) {
557 setData.children_name = data.name 558 setData.children_name = data.name
@@ -601,6 +602,7 @@ Page({ @@ -601,6 +602,7 @@ Page({
601 } 602 }
602 if (data.spouse_id_card_no && data.spouse_id_card_no.length) { 603 if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
603 setData.spouse_id_card_no = data.spouse_id_card_no 604 setData.spouse_id_card_no = data.spouse_id_card_no
  605 + this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
604 } 606 }
605 if (this.data.loverbirthDate.selected.length) { 607 if (this.data.loverbirthDate.selected.length) {
606 var loverbirthDate = this.data.loverbirthDate 608 var loverbirthDate = this.data.loverbirthDate
@@ -660,24 +662,17 @@ Page({ @@ -660,24 +662,17 @@ Page({
660 break; 662 break;
661 case 'support_duty': 663 case 'support_duty':
662 var setData = {} 664 var setData = {}
663 - if (data.supported_name && data.supported_name.length) {  
664 - setData.supported_name = data.supported_name  
665 - }  
666 - if (data.percentage && data.percentage.length) {  
667 - setData.percentage = data.percentage 665 + if (data.name && data.name.length) {
  666 + setData.supported_name = data.name
668 } 667 }
669 if (data.id_card_no && data.id_card_no.length) { 668 if (data.id_card_no && data.id_card_no.length) {
670 setData.id_card_no = data.id_card_no 669 setData.id_card_no = data.id_card_no
  670 + this.dealIdInfo(data.id_card_no, 'older_id_card_no_input')
671 } 671 }
672 - if (data.support_type && data.support_type.length) {  
673 - var supporttypeData = this.data.supporttypeData  
674 - supporttypeData.selected = data.support_type  
675 - setData.supporttypeData = supporttypeData  
676 - }  
677 - if (data.birthday && data.birthday.length) { 672 + if (data.birth_date && data.birth_date.length) {
678 var olderbirthDate = this.data.olderbirthDate 673 var olderbirthDate = this.data.olderbirthDate
679 - olderbirthDate.selected = format.formatTime_date(data.birthday)  
680 - olderbirthDate.datelong = data.birthday 674 + olderbirthDate.selected = format.formatTime_date(data.birth_date)
  675 + olderbirthDate.datelong = data.birth_date
681 setData.olderbirthDate = olderbirthDate 676 setData.olderbirthDate = olderbirthDate
682 } 677 }
683 if (data.relationship && data.relationship.length) { 678 if (data.relationship && data.relationship.length) {
@@ -685,9 +680,6 @@ Page({ @@ -685,9 +680,6 @@ Page({
685 older_relativeData.selected = data.relationship 680 older_relativeData.selected = data.relationship
686 setData.older_relativeData = older_relativeData 681 setData.older_relativeData = older_relativeData
687 } 682 }
688 - if (data.percentage && data.percentage.length) {  
689 - setData.percentage = data.percentage  
690 - }  
691 this.setData(setData) 683 this.setData(setData)
692 break; 684 break;
693 case 'medical_fund': 685 case 'medical_fund':
@@ -697,6 +689,7 @@ Page({ @@ -697,6 +689,7 @@ Page({
697 } 689 }
698 if (data.id_card_no && data.id_card_no.length) { 690 if (data.id_card_no && data.id_card_no.length) {
699 setData.id_card_no = data.id_card_no 691 setData.id_card_no = data.id_card_no
  692 + this.dealIdInfo(data.id_card_no, 'medical_id_card_no_input')
700 } 693 }
701 if (data.family_ties && data.family_ties.length) { 694 if (data.family_ties && data.family_ties.length) {
702 var taxperson_relativeData = this.data.taxperson_relativeData 695 var taxperson_relativeData = this.data.taxperson_relativeData
@@ -718,6 +711,7 @@ Page({ @@ -718,6 +711,7 @@ Page({
718 } 711 }
719 if (data.spouse_id_card_no && data.spouse_id_card_no.length) { 712 if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
720 setData.spouse_id_card_no = data.spouse_id_card_no 713 setData.spouse_id_card_no = data.spouse_id_card_no
  714 + this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
721 } 715 }
722 if (this.data.loverbirthDate.selected.length) { 716 if (this.data.loverbirthDate.selected.length) {
723 var loverbirthDate = this.data.loverbirthDate 717 var loverbirthDate = this.data.loverbirthDate
@@ -875,6 +869,7 @@ Page({ @@ -875,6 +869,7 @@ Page({
875 869
876 if (this.idcard_belong == 'children_id_card_no') { 870 if (this.idcard_belong == 'children_id_card_no') {
877 this.data.commonbirthDate.selected = birth_day 871 this.data.commonbirthDate.selected = birth_day
  872 + this.data.commonbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
878 data = { 873 data = {
879 children_id_card_no: id_info.id_card_number, 874 children_id_card_no: id_info.id_card_number,
880 children_name: id_info.name, 875 children_name: id_info.name,
@@ -882,6 +877,7 @@ Page({ @@ -882,6 +877,7 @@ Page({
882 } 877 }
883 } else if (this.idcard_belong == 'spouse_id_card_no') { 878 } else if (this.idcard_belong == 'spouse_id_card_no') {
884 this.data.loverbirthDate.selected = birth_day 879 this.data.loverbirthDate.selected = birth_day
  880 + this.data.loverbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
885 data = { 881 data = {
886 spouse_id_card_no: id_info.id_card_number, 882 spouse_id_card_no: id_info.id_card_number,
887 spouse_name: id_info.name, 883 spouse_name: id_info.name,
@@ -889,15 +885,18 @@ Page({ @@ -889,15 +885,18 @@ Page({
889 } 885 }
890 } else if (this.idcard_belong == 'older_id_card_no') { 886 } else if (this.idcard_belong == 'older_id_card_no') {
891 this.data.olderbirthDate.selected = birth_day 887 this.data.olderbirthDate.selected = birth_day
  888 + this.data.olderbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
892 data = { 889 data = {
893 id_card_no: id_info.id_card_number, 890 id_card_no: id_info.id_card_number,
894 supported_name: id_info.name, 891 supported_name: id_info.name,
895 olderbirthDate: this.data.olderbirthDate 892 olderbirthDate: this.data.olderbirthDate
896 } 893 }
897 - } else if (this.idcard_belong == 'owner_id_card_no') {  
898 - this.data.olderbirthDate.selected = birth_day 894 + } else if (this.idcard_belong == 'medical_id_card_no') {
  895 + this.data.commonbirthDate.selected = birth_day
  896 + this.data.commonbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
899 data = { 897 data = {
900 - owner_id_card_no: id_info.id_card_number, 898 + id_card_no: id_info.id_card_number,
  899 + commonbirthDate: this.data.commonbirthDate
901 } 900 }
902 } 901 }
903 this.setData(data) 902 this.setData(data)
@@ -169,7 +169,10 @@ @@ -169,7 +169,10 @@
169 <view style='height:90rpx'> 169 <view style='height:90rpx'>
170 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 170 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
171 <text class='text_black_30 float_left'>病人证照号码</text> 171 <text class='text_black_30 float_left'>病人证照号码</text>
172 - <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> 172 + <view wx:if="{{isIdCard}}">
  173 + <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="medical_id_card_no"></image>
  174 + <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>
  175 + </view>
173 </view> 176 </view>
174 <view class='divide_line_f5f5f5'></view> 177 <view class='divide_line_f5f5f5'></view>
175 <template is="picker_cell_normal" data="{{...commonbirthDate}}" /> 178 <template is="picker_cell_normal" data="{{...commonbirthDate}}" />
注册登录 后发表评论