提交 4d83a7921586c56d13013f676d00ca65b11a8fd6

作者 wangyu
2 个父辈 aa5cd1c2 6ca41071

Merge branch 'dev2.0' into dev_wy

@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <view class='divide_line'></view> 18 <view class='divide_line'></view>
19 <view style='height:90rpx;padding:0 30rpx'> 19 <view style='height:90rpx;padding:0 30rpx'>
20 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 20 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
21 - <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人证号码</text> 21 + <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人证号码</text>
22 <view> 22 <view>
23 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="children_id_card_no"></image> 23 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="children_id_card_no"></image>
24 <input class='input_wrap01 float_right' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='id_card_no' maxlength='18' type='idcard' value='{{id_card_no}}'></input> 24 <input class='input_wrap01 float_right' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='id_card_no' maxlength='18' type='idcard' value='{{id_card_no}}'></input>
@@ -197,7 +197,7 @@ Page({ @@ -197,7 +197,7 @@ Page({
197 onChange: 'onPickerSelect' 197 onChange: 'onPickerSelect'
198 }, 198 },
199 cardtypeData: { 199 cardtypeData: {
200 - label: '证类型', 200 + label: '证类型',
201 isrequre: true, 201 isrequre: true,
202 bindtype: 'cardtype', 202 bindtype: 'cardtype',
203 selected: '居民身份证', 203 selected: '居民身份证',
@@ -1165,6 +1165,7 @@ Page({ @@ -1165,6 +1165,7 @@ Page({
1165 this.showToast('请选择贷款期限') 1165 this.showToast('请选择贷款期限')
1166 return 1166 return
1167 } 1167 }
  1168 + newdata.loan_months = parseInt(formdata.loan_months)
1168 newdata.loan_before_marry = this.data.beforemarryData.selected == "是" ? 'y' : 'n' 1169 newdata.loan_before_marry = this.data.beforemarryData.selected == "是" ? 'y' : 'n'
1169 newdata.loan_by_self = this.data.isselfData.selected == "是" ? 'y' : 'n' 1170 newdata.loan_by_self = this.data.isselfData.selected == "是" ? 'y' : 'n'
1170 newdata.certification_type = this.data.identifytypeData.selected 1171 newdata.certification_type = this.data.identifytypeData.selected
@@ -1197,10 +1198,10 @@ Page({ @@ -1197,10 +1198,10 @@ Page({
1197 // return 1198 // return
1198 // } 1199 // }
1199 else if (this.data.cardtypeData.selected.length < 1) { 1200 else if (this.data.cardtypeData.selected.length < 1) {
1200 - this.showToast('请选择证类型') 1201 + this.showToast('请选择证类型')
1201 return 1202 return
1202 } else if (!formdata.owner_id_card_no || formdata.owner_id_card_no.length < 1) { 1203 } else if (!formdata.owner_id_card_no || formdata.owner_id_card_no.length < 1) {
1203 - this.showToast('请填写证号码') 1204 + this.showToast('请填写证号码')
1204 return 1205 return
1205 } else if (this.data.rentLocateInfo.address_value[0].length < 1) { 1206 } else if (this.data.rentLocateInfo.address_value[0].length < 1) {
1206 this.showToast('请选择房屋地址') 1207 this.showToast('请选择房屋地址')
@@ -1291,7 +1292,8 @@ Page({ @@ -1291,7 +1292,8 @@ Page({
1291 }) 1292 })
1292 }else{ 1293 }else{
1293 wx.showToast({ 1294 wx.showToast({
1294 - title: res.message 1295 + title: res.data.message ? res.data.message:'请求出错',
  1296 + icon:'none'
1295 }) 1297 })
1296 } 1298 }
1297 } 1299 }
@@ -10,13 +10,13 @@ @@ -10,13 +10,13 @@
10 <view class='divide_line_f5f5f5'></view> 10 <view class='divide_line_f5f5f5'></view>
11 <view style='height:90rpx'> 11 <view style='height:90rpx'>
12 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 12 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
13 - <text class='text_black_30 float_left' style='line-height: 90rpx'>子女证号码</text> 13 + <text class='text_black_30 float_left' style='line-height: 90rpx'>子女证号码</text>
14 <view wx:if="{{isIdCard}}"> 14 <view wx:if="{{isIdCard}}">
15 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="children_id_card_no"></image> 15 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="children_id_card_no"></image>
16 - <input class='input_wrap01 float_right' placeholder='请输入证号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' type='idcard' value='{{children_id_card_no}}' bindinput="idChange" id='children_id_card_no_input'></input> 16 + <input class='input_wrap01 float_right' placeholder='请输入证号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' type='idcard' value='{{children_id_card_no}}' bindinput="idChange" id='children_id_card_no_input'></input>
17 </view> 17 </view>
18 <!-- <view wx:else> 18 <!-- <view wx:else>
19 - <input class='input_wrap float_right' placeholder='请输入证号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' type='idcard' value='{{children_id_card_no}}'></input> 19 + <input class='input_wrap float_right' placeholder='请输入证号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' type='idcard' value='{{children_id_card_no}}'></input>
20 </view> --> 20 </view> -->
21 </view> 21 </view>
22 <view class='divide_line_f5f5f5'></view> 22 <view class='divide_line_f5f5f5'></view>
@@ -131,7 +131,7 @@ @@ -131,7 +131,7 @@
131 <text class='text_black_30 float_left'>被赡养人证照号码</text> 131 <text class='text_black_30 float_left'>被赡养人证照号码</text>
132 <view wx:if="{{isIdCard}}"> 132 <view wx:if="{{isIdCard}}">
133 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="older_id_card_no"></image> 133 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="older_id_card_no"></image>
134 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;' placeholder='请输入证号码' maxlength='18' type='idcard' name='id_card_no' value='{{id_card_no}}' bindinput="idChange" id="older_id_card_no_input"></input> 134 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;' placeholder='请输入证号码' maxlength='18' type='idcard' name='id_card_no' value='{{id_card_no}}' bindinput="idChange" id="older_id_card_no_input"></input>
135 </view> 135 </view>
136 </view> 136 </view>
137 <view class='divide_line_f5f5f5'></view> 137 <view class='divide_line_f5f5f5'></view>
@@ -266,10 +266,10 @@ @@ -266,10 +266,10 @@
266 <view class='divide_line_f5f5f5'></view> 266 <view class='divide_line_f5f5f5'></view>
267 <view style='height:90rpx'> 267 <view style='height:90rpx'>
268 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text> 268 <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
269 - <text class='text_black_30 float_left'>证号码</text> 269 + <text class='text_black_30 float_left'>证号码</text>
270 <view wx:if="{{isIdCard}}"> 270 <view wx:if="{{isIdCard}}">
271 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="owner_id_card_no"></image> 271 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="owner_id_card_no"></image>
272 - <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;' placeholder='请输入证号码' maxlength='18' type='idcard' name='owner_id_card_no' value='{{owner_id_card_no}}' bindinput="idChange" id='owner_id_card_no_input'></input> 272 + <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;' placeholder='请输入证号码' maxlength='18' type='idcard' name='owner_id_card_no' value='{{owner_id_card_no}}' bindinput="idChange" id='owner_id_card_no_input'></input>
273 </view> 273 </view>
274 </view> 274 </view>
275 </view> 275 </view>
@@ -323,10 +323,10 @@ @@ -323,10 +323,10 @@
323 <template is="picker_cell_normal" data="{{...lovercardtypeData}}" /> 323 <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />
324 <view class='divide_line_f5f5f5'></view> 324 <view class='divide_line_f5f5f5'></view>
325 <view style='height:90rpx'> 325 <view style='height:90rpx'>
326 - <text class='text_black_30 float_left'>配偶证号码</text> 326 + <text class='text_black_30 float_left'>配偶证号码</text>
327 <view wx:if="{{isIdCard}}"> 327 <view wx:if="{{isIdCard}}">
328 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image> 328 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image>
329 - <input class='input_wrap01 float_right' placeholder='请输入证号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}' bindinput="idChange" id='spouse_id_card_no_input'></input> 329 + <input class='input_wrap01 float_right' placeholder='请输入证号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}' bindinput="idChange" id='spouse_id_card_no_input'></input>
330 </view> 330 </view>
331 </view> 331 </view>
332 <view class='divide_line_f5f5f5'></view> 332 <view class='divide_line_f5f5f5'></view>
@@ -267,7 +267,7 @@ Page({ @@ -267,7 +267,7 @@ Page({
267 this.showtoast('有必填项未填写'); 267 this.showtoast('有必填项未填写');
268 return 268 return
269 } else if (this.data.isIdCard && !format.isIDCardNum(formdata.id_card_no)) { 269 } else if (this.data.isIdCard && !format.isIDCardNum(formdata.id_card_no)) {
270 - this.showtoast('证号码有误'); 270 + this.showtoast('证号码有误');
271 return 271 return
272 } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) { 272 } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
273 this.showtoast('有必填项未填写'); 273 this.showtoast('有必填项未填写');
@@ -23,10 +23,10 @@ @@ -23,10 +23,10 @@
23 <view wx:if="{{isIdCard}}" > 23 <view wx:if="{{isIdCard}}" >
24 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image> 24 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image>
25 <!-- <text class='text_333_28 float_right'>{{card_number}}</text> --> 25 <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
26 - <input class='input_wrap float_right' placeholder='请输入证号码' placeholder-class='text_777_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input> 26 + <input class='input_wrap float_right' placeholder='请输入证号码' placeholder-class='text_777_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
27 </view> 27 </view>
28 <view wx:else> 28 <view wx:else>
29 - <input class='input_wrap float_right' placeholder='请输入证号码' placeholder-class='text_777_30' name='id_card_no' maxlength='18' type="idcard" value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input> 29 + <input class='input_wrap float_right' placeholder='请输入证号码' placeholder-class='text_777_30' name='id_card_no' maxlength='18' type="idcard" value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
30 </view> 30 </view>
31 </view> 31 </view>
32 <view class="divide_line"></view> 32 <view class="divide_line"></view>
@@ -856,7 +856,7 @@ Page({ @@ -856,7 +856,7 @@ Page({
856 this.showtoast('有必填项未填写'); 856 this.showtoast('有必填项未填写');
857 return 857 return
858 } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) { 858 } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
859 - this.showtoast('证号码有误'); 859 + this.showtoast('证号码有误');
860 return 860 return
861 } 861 }
862 // else if (!this.data.isIdCard && (this.data.card_number.length < 1 && formdata.id_card_no.length < 1)) { 862 // else if (!this.data.isIdCard && (this.data.card_number.length < 1 && formdata.id_card_no.length < 1)) {
@@ -98,15 +98,15 @@ @@ -98,15 +98,15 @@
98 <view wx:if="{{isIdCard}}"> 98 <view wx:if="{{isIdCard}}">
99 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image> 99 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
100 <!-- <text class='text_333_28 float_right'>{{card_number}}</text> --> 100 <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
101 - <!-- <input class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'&&card_number?card_number:'请输入证件号码'}}" placeholder-class='text_999_28' name='id_card_no' maxlength='24' disabled="{{taxInfo.certification_status=='active'}}"></input> -->  
102 - <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证件号码" value='{{card_number}}' name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" maxlength='24' bindblur='bindinputcardnum'></input>  
103 - <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||card_number?card_number:'请输入证件号码'}}" name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" 101 + <!-- <input class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'&&card_number?card_number:'请输入证照号码'}}" placeholder-class='text_999_28' name='id_card_no' maxlength='24' disabled="{{taxInfo.certification_status=='active'}}"></input> -->
  102 + <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" maxlength='24' bindblur='bindinputcardnum'></input>
  103 + <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||card_number?card_number:'请输入证照号码'}}" name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}"
104 maxlength='24' bindblur='bindinputcardnum'></input> 104 maxlength='24' bindblur='bindinputcardnum'></input>
105 105
106 </view> 106 </view>
107 <view wx:else> 107 <view wx:else>
108 - <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证件号码" value='{{card_number}}' name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" maxlength='24' bindblur='bindinputcardnum'></input>  
109 - <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||card_number?card_number:'请输入证件号码'}}" name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" 108 + <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" maxlength='24' bindblur='bindinputcardnum'></input>
  109 + <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||card_number?card_number:'请输入证照号码'}}" name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}"
110 bindblur='bindinputcardnum' maxlength='24'></input> 110 bindblur='bindinputcardnum' maxlength='24'></input>
111 </view> 111 </view>
112 </view> 112 </view>
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <text class='text_white_22'>{{item.newmobile&&item.newmobile.length>0?item.newmobile:"未录入手机号码"}}</text> 30 <text class='text_white_22'>{{item.newmobile&&item.newmobile.length>0?item.newmobile:"未录入手机号码"}}</text>
31 <text style='margin:0rpx 20rpx;color:#fff;font-size: 20rpx;'>|</text> 31 <text style='margin:0rpx 20rpx;color:#fff;font-size: 20rpx;'>|</text>
32 <image class='id_image_wrap' src='/images/id.png'></image> 32 <image class='id_image_wrap' src='/images/id.png'></image>
33 - <text class='text_white_22'>{{item.newidnum&&item.newidnum.length>0?item.newidnum:"未录入证号码 "}}</text> 33 + <text class='text_white_22'>{{item.newidnum&&item.newidnum.length>0?item.newidnum:"未录入证号码 "}}</text>
34 </view> 34 </view>
35 </view> 35 </view>
36 <view class='rectangle_solid_bg'> 36 <view class='rectangle_solid_bg'>
注册登录 后发表评论