Merge branch 'dev2.0' into dev_wy

@@ -18,7 +18,7 @@
     <view class='divide_line'></view>
     <view style='height:90rpx;padding:0 30rpx'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-      <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人证件号码</text>
+      <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人证照号码</text>
       <view>
         <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="children_id_card_no"></image>
         <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({
       onChange: 'onPickerSelect'
     },
     cardtypeData: {
-      label: '证件类型',
+      label: '证照类型',
       isrequre: true,
       bindtype: 'cardtype',
       selected: '居民身份证',
@@ -1165,6 +1165,7 @@ Page({
             this.showToast('请选择贷款期限')
             return
           }
+          newdata.loan_months = parseInt(formdata.loan_months)
           newdata.loan_before_marry = this.data.beforemarryData.selected == "是" ? 'y' : 'n'
           newdata.loan_by_self = this.data.isselfData.selected == "是" ? 'y' : 'n'
           newdata.certification_type = this.data.identifytypeData.selected
@@ -1197,10 +1198,10 @@ Page({
           //   return
           // } 
           else if (this.data.cardtypeData.selected.length < 1) {
-            this.showToast('请选择证件类型')
+            this.showToast('请选择证照类型')
             return
           } else if (!formdata.owner_id_card_no || formdata.owner_id_card_no.length < 1) {
-            this.showToast('请填写证件号码')
+            this.showToast('请填写证照号码')
             return
           } else if (this.data.rentLocateInfo.address_value[0].length < 1) {
             this.showToast('请选择房屋地址')
@@ -1291,7 +1292,8 @@ Page({
                 })
               }else{
                 wx.showToast({
-                  title: res.message
+                  title: res.data.message ? res.data.message:'请求出错',
+                  icon:'none'
                 })
               }
             }

@@ -10,13 +10,13 @@
         <view class='divide_line_f5f5f5'></view>
         <view style='height:90rpx'>
           <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>子女证件号码</text>
+          <text class='text_black_30 float_left' style='line-height: 90rpx'>子女证照号码</text>
           <view wx:if="{{isIdCard}}">
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="children_id_card_no"></image>
-            <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>
+            <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>
           </view>
           <!-- <view wx:else>
-              <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>
+              <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>
             </view> -->
         </view>
         <view class='divide_line_f5f5f5'></view>
@@ -131,7 +131,7 @@
     <text class='text_black_30 float_left'>被赡养人证照号码</text>
     <view wx:if="{{isIdCard}}">
       <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="older_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='请输入证件号码' maxlength='18' type='idcard' name='id_card_no' value='{{id_card_no}}' bindinput="idChange" id="older_id_card_no_input"></input>
+      <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>
     </view>
   </view>
   <view class='divide_line_f5f5f5'></view>
@@ -266,10 +266,10 @@
       <view class='divide_line_f5f5f5'></view>
       <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>
+        <text class='text_black_30 float_left'>证照号码</text>
         <view wx:if="{{isIdCard}}">
           <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="owner_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='请输入证件号码' maxlength='18' type='idcard'  name='owner_id_card_no' value='{{owner_id_card_no}}' bindinput="idChange" id='owner_id_card_no_input'></input>
+          <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>
         </view>
       </view>
     </view>
@@ -323,10 +323,10 @@
     <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />
     <view class='divide_line_f5f5f5'></view>
     <view style='height:90rpx'>
-      <text class='text_black_30 float_left'>配偶证件号码</text>
+      <text class='text_black_30 float_left'>配偶证照号码</text>
       <view wx:if="{{isIdCard}}">
         <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="lover"></image>
-        <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>
+        <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>
       </view>
     </view>
     <view class='divide_line_f5f5f5'></view>

@@ -267,7 +267,7 @@ Page({
       this.showtoast('有必填项未填写');
       return
     } else if (this.data.isIdCard && !format.isIDCardNum(formdata.id_card_no)) {
-      this.showtoast('证件号码有误');
+      this.showtoast('证照号码有误');
       return
     } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
       this.showtoast('有必填项未填写');

@@ -23,10 +23,10 @@
           <view wx:if="{{isIdCard}}"   >
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image>
             <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
-             <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>
+             <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>
           </view>
           <view wx:else>
-            <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>
+            <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>
           </view>
         </view>
         <view class="divide_line"></view>

@@ -856,7 +856,7 @@ Page({
       this.showtoast('有必填项未填写');
       return
     } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
-      this.showtoast('证件号码有误');
+      this.showtoast('证照号码有误');
       return
     }
     // else if (!this.data.isIdCard && (this.data.card_number.length < 1 &&  formdata.id_card_no.length < 1)) {

@@ -98,15 +98,15 @@
           <view wx:if="{{isIdCard}}">
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
             <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
-            <!-- <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> -->
-            <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>
-            <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'}}"
+            <!-- <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> -->
+            <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>
+            <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'}}"
               maxlength='24' bindblur='bindinputcardnum'></input>
 
           </view>
           <view wx:else>
-            <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>
-            <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'}}"
+            <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>
+            <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'}}"
               bindblur='bindinputcardnum' maxlength='24'></input>
           </view>
         </view>

@@ -30,7 +30,7 @@
             <text class='text_white_22'>{{item.newmobile&&item.newmobile.length>0?item.newmobile:"未录入手机号码"}}</text>
             <text style='margin:0rpx 20rpx;color:#fff;font-size: 20rpx;'>|</text>
             <image class='id_image_wrap' src='/images/id.png'></image>
-            <text class='text_white_22'>{{item.newidnum&&item.newidnum.length>0?item.newidnum:"未录入证件号码  "}}</text>
+            <text class='text_white_22'>{{item.newidnum&&item.newidnum.length>0?item.newidnum:"未录入证照号码  "}}</text>
           </view>
         </view>
         <view class='rectangle_solid_bg'>