Merge branch 'dev_py' into dev2.0

@@ -1402,7 +1402,7 @@ Page({
           }
         }
         if (!formdata.school_name || formdata.school_name.length < 1) {
-          this.showToast('请选择就读学校')
+          this.showToast('请填写就读学校')
           return
         }
         if (this.data.hasLoverData.selected.length < 1) {
@@ -1640,7 +1640,7 @@ Page({
               this.showToast('请选择首次还款日期')
               return
             } else if (!formdata.loan_months || formdata.loan_months.length < 1) {
-              this.showToast('请选择公积金贷款期限')
+              this.showToast('请填写公积金贷款期限')
               return
             }
             newdata.loan_bank = this.data.bankInfo.selected
@@ -1658,7 +1658,7 @@ Page({
               this.showToast('请选择首次还款日期')
               return
             } else if (!formdata.sec_loan_months || formdata.sec_loan_months.length < 1) {
-              this.showToast('请选择商业贷款期限')
+              this.showToast('请填写商业贷款期限')
               return
             }
             newdata.sec_loan_bank = this.data.bankInfo_2.selected

@@ -113,7 +113,7 @@ Page({
   //对各参数初始赋值
   handleDatas: function (tax_info) {
 
-    var isDisable = tax_info.certification_status == 'active'//已通过拍摄身份证认证过，不能修改
+    var isDisable = tax_info.certification_status == 'active' && tax_info.id_card_no.length//已通过拍摄身份证认证过，不能修改
 
     this.data.relativeData.selected = tax_info.family_ties
     // this.data.cardtypeData.selected = tax_info.id_card_type

@@ -278,7 +278,7 @@ Page({
     console.log('curdate', curdate)
 
     this.data.name = tax_info.name
-    if (tax_info.certification_status == 'active') {//已通过拍摄身份证认证过，不能修改
+    if (tax_info.certification_status == 'active' && tax_info.id_card_no.length) {//已通过拍摄身份证认证过，不能修改
       this.data.genderData.disabled = true
       this.data.birthDate.disabled = true
       this.data.cardtypeData.disabled = true

@@ -28,8 +28,8 @@
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
           <view>
-            <image  wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
-            <input class='input_wrap' disabled="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum' type='idcard'></input>
+            <image  wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active' && taxInfo.id_card_no.length>0}}"></image>
+            <input class='input_wrap' disabled="{{taxInfo.certification_status=='active' && taxInfo.id_card_no.length>0}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum' type='idcard'></input>
             <!-- <input class='input_wrap' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
             <input class='input_wrap' hidden="{{taxInfo.certification_status!='active'}}"  placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input> -->
           </view>
@@ -37,7 +37,7 @@
         <view class='item_body' hidden="{{!isself}}">
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left' style='line-height: 90rpx'>姓名</text>
-          <input class='input_wrap' placeholder="请输入姓名" value='{{name}}' disabled="{{taxInfo.certification_status=='active'}}" bindblur='bindinputname' style='line-height: 90rpx'></input>
+          <input class='input_wrap' placeholder="请输入姓名" value='{{name}}' disabled="{{taxInfo.certification_status=='active' && taxInfo.id_card_no.length>0}}" bindblur='bindinputname' style='line-height: 90rpx'></input>
           <!-- <input hidden="{{taxInfo.certification_status=='active'}}" class='input_wrap' placeholder="请输入姓名" value='{{name}}' bindblur='bindinputname' style='line-height: 90rpx'></input>
           <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap' placeholder="{{name}}" disabled="true" bindblur='bindinputname' style='line-height: 90rpx'></input> -->
         </view>