wangyu / naturalPersonTax · 提交

提交 758fc5c3bade9c8a95798cbd19e25465aea28674

作者 pangy
2 个父辈 9bd159a0 2608faab
构建： 未知

Merge branch 'dev_py' into dev2.0

内嵌 并排对比
正在显示 4 个修改的文件 包含 8 行增加 和 8 行删除
@@ -1402,7 +1402,7 @@ Page({ @@ -1402,7 +1402,7 @@ Page({
1402 } 1402 }
1403 } 1403 }
1404 if (!formdata.school_name || formdata.school_name.length < 1) { 1404 if (!formdata.school_name || formdata.school_name.length < 1) {
1405 - this.showToast('请选择就读学校') 1405 + this.showToast('请填写就读学校')
1406 return 1406 return
1407 } 1407 }
1408 if (this.data.hasLoverData.selected.length < 1) { 1408 if (this.data.hasLoverData.selected.length < 1) {
@@ -1640,7 +1640,7 @@ Page({ @@ -1640,7 +1640,7 @@ Page({
1640 this.showToast('请选择首次还款日期') 1640 this.showToast('请选择首次还款日期')
1641 return 1641 return
1642 } else if (!formdata.loan_months || formdata.loan_months.length < 1) { 1642 } else if (!formdata.loan_months || formdata.loan_months.length < 1) {
1643 - this.showToast('请选择公积金贷款期限') 1643 + this.showToast('请填写公积金贷款期限')
1644 return 1644 return
1645 } 1645 }
1646 newdata.loan_bank = this.data.bankInfo.selected 1646 newdata.loan_bank = this.data.bankInfo.selected
@@ -1658,7 +1658,7 @@ Page({ @@ -1658,7 +1658,7 @@ Page({
1658 this.showToast('请选择首次还款日期') 1658 this.showToast('请选择首次还款日期')
1659 return 1659 return
1660 } else if (!formdata.sec_loan_months || formdata.sec_loan_months.length < 1) { 1660 } else if (!formdata.sec_loan_months || formdata.sec_loan_months.length < 1) {
1661 - this.showToast('请选择商业贷款期限') 1661 + this.showToast('请填写商业贷款期限')
1662 return 1662 return
1663 } 1663 }
1664 newdata.sec_loan_bank = this.data.bankInfo_2.selected 1664 newdata.sec_loan_bank = this.data.bankInfo_2.selected
@@ -113,7 +113,7 @@ Page({ @@ -113,7 +113,7 @@ Page({
113 //对各参数初始赋值 113 //对各参数初始赋值
114 handleDatas: function (tax_info) { 114 handleDatas: function (tax_info) {
115 115
116 - var isDisable = tax_info.certification_status == 'active'//已通过拍摄身份证认证过，不能修改 116 + var isDisable = tax_info.certification_status == 'active' && tax_info.id_card_no.length//已通过拍摄身份证认证过，不能修改
117 117
118 this.data.relativeData.selected = tax_info.family_ties 118 this.data.relativeData.selected = tax_info.family_ties
119 // this.data.cardtypeData.selected = tax_info.id_card_type 119 // this.data.cardtypeData.selected = tax_info.id_card_type
@@ -278,7 +278,7 @@ Page({ @@ -278,7 +278,7 @@ Page({
278 console.log('curdate', curdate) 278 console.log('curdate', curdate)
279 279
280 this.data.name = tax_info.name 280 this.data.name = tax_info.name
281 - if (tax_info.certification_status == 'active') {//已通过拍摄身份证认证过，不能修改 281 + if (tax_info.certification_status == 'active' && tax_info.id_card_no.length) {//已通过拍摄身份证认证过，不能修改
282 this.data.genderData.disabled = true 282 this.data.genderData.disabled = true
283 this.data.birthDate.disabled = true 283 this.data.birthDate.disabled = true
284 this.data.cardtypeData.disabled = true 284 this.data.cardtypeData.disabled = true
@@ -28,8 +28,8 @@ @@ -28,8 +28,8 @@
28 <text class='red_star_right_10'>*</text> 28 <text class='red_star_right_10'>*</text>
29 <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text> 29 <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
30 <view> 30 <view>
31 - <image wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>  
32 - <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> 31 + <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>
  32 + <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>
33 <!-- <input class='input_wrap' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input> 33 <!-- <input class='input_wrap' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
34 <input class='input_wrap' hidden="{{taxInfo.certification_status!='active'}}" placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input> --> 34 <input class='input_wrap' hidden="{{taxInfo.certification_status!='active'}}" placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input> -->
35 </view> 35 </view>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <view class='item_body' hidden="{{!isself}}"> 37 <view class='item_body' hidden="{{!isself}}">
38 <text class='red_star_right_10'>*</text> 38 <text class='red_star_right_10'>*</text>
39 <text class='text_777_30 float_left' style='line-height: 90rpx'>姓名</text> 39 <text class='text_777_30 float_left' style='line-height: 90rpx'>姓名</text>
40 - <input class='input_wrap' placeholder="请输入姓名" value='{{name}}' disabled="{{taxInfo.certification_status=='active'}}" bindblur='bindinputname' style='line-height: 90rpx'></input> 40 + <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>
41 <!-- <input hidden="{{taxInfo.certification_status=='active'}}" class='input_wrap' placeholder="请输入姓名" value='{{name}}' bindblur='bindinputname' style='line-height: 90rpx'></input> 41 <!-- <input hidden="{{taxInfo.certification_status=='active'}}" class='input_wrap' placeholder="请输入姓名" value='{{name}}' bindblur='bindinputname' style='line-height: 90rpx'></input>
42 <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap' placeholder="{{name}}" disabled="true" bindblur='bindinputname' style='line-height: 90rpx'></input> --> 42 <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap' placeholder="{{name}}" disabled="true" bindblur='bindinputname' style='line-height: 90rpx'></input> -->
43 </view> 43 </view>
请 注册 或 登录 后发表评论