Merge branch '机器人' into 海峡

# Conflicts:
#	app.js

@@ -157,10 +157,20 @@ Page({
     if (this.data.cardtype.length < 1) {
       this.showToast("请选择证照类型")
       return;
-    } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
+    } 
+    if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
       this.showToast("请输入证件号码")
       return;
-    } else if (this.data.cardtype == '居民身份证' && !format.isIDCardNum(formdata.id_card_no)) {
+    } 
+    if (this.data.cardtype == '居民身份证' && !format.isIDCardNum(formdata.id_card_no)) {
+      this.showToast("证件号码有误")
+      return;
+    }
+    if (this.data.cardtype == '中国护照' && formdata.id_card_no.length!=9) {
+      this.showToast("证件号码有误")
+      return;
+    }
+    if ((this.data.cardtype.indexOf('港澳') != -1 || this.data.cardtype.indexOf('台湾') != -1) &&! /^\d{18}$/.test(formdata.id_card_no)) {
       this.showToast("证件号码有误")
       return;
     }

@@ -28,7 +28,7 @@
         <input class='input_wrap01 float_right' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='id_card_no' maxlength='18' type='idcard' value='{{id_card_no}}' bindinput="bindinput"></input>
       </view>
       <view wx:else>
-        <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='id_card_no' maxlength='24' value='{{id_card_no}}' bindinput="bindinput"></input>
+        <input class='input_wrap01 float_right' placeholder='请输入证件号码' placeholder-class='text_999_30' name='id_card_no' maxlength='20' value='{{id_card_no}}' bindinput="bindinput"></input>
       </view>
     </view>
     <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>

 // pages/main/addtionalreduce/addextrainfo/addextrainfo.js
 var format = require('../../../../utils/util.js');
 // var countryInfo = require('../../../../utils/country.js');
+const reg_18_Number = /^[0-9]{18}$/;
+const reg_9_n_a = /^([a-zA-z]|[0-9]){9}$/;
 const cardTypeArray = ['居民身份证', '中国护照', '港澳居民来往内地通行证', '港澳居民居住证', '台湾居民来往大陆通行证', '台湾居民居住证', '外国护照', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
 var OSSInit;
 var app = getApp();
@@ -1437,6 +1439,7 @@ Page({
   //   return bank_name
   // },
 
+
   formSubmit: function(e) {
     console.log("formSubmit", e);
     var formdata = e.detail.value
@@ -1454,7 +1457,15 @@ Page({
           return
         }
         if (this.data.isIdCard_child && !format.isIDCardNum(formdata.children_id_card_no)) {
-          this.showToast('身份证格式有误')
+          this.showToast('子女证照号码有误')
+          return
+        } 
+        if (this.data.childrencardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(formdata.children_id_card_no)) {
+          this.showToast('子女证照号码有误');
+          return
+        } 
+        if (this.data.childrencardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(formdata.children_id_card_no)) {
+          this.showToast('子女证照号码有误');
           return
         }
         if (format.getAge(this.data.commonbirthDate.selected) < 3) {
@@ -1537,9 +1548,18 @@ Page({
             this.showToast('请填写配偶证照号码')
             return
           } else if (this.data.isIdCard_lover && !format.isIDCardNum(formdata.spouse_id_card_no)) {
-            this.showToast('配偶身份证格式有误')
+            this.showToast('配偶证照号码有误')
             return
-          }else if (this.data.loverbirthDate.selected.length < 1) {
+          }
+          if (this.data.lovercardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(formdata.spouse_id_card_no)) {
+            this.showToast('配偶证照号码有误');
+            return
+          }
+          if (this.data.lovercardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(formdata.spouse_id_card_no)) {
+            this.showToast('配偶证照号码有误');
+            return
+          }
+          if (this.data.loverbirthDate.selected.length < 1) {
             this.showToast('请选择配偶出生日期')
             return
           }
@@ -1658,6 +1678,14 @@ Page({
           this.showToast('被赡养人身份证格式有误')
           return
         }
+        if (this.data.oldercardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(formdata.id_card_no)) {
+          this.showToast('被赡养人证照号码有误');
+          return
+        }
+        if (this.data.oldercardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(formdata.id_card_no)) {
+          this.showToast('被赡养人证照号码有误');
+          return
+        }
         if (this.data.olderbirthDate.selected.length < 1) {
           this.showToast('请选择出生日期')
           return
@@ -1737,7 +1765,6 @@ Page({
         break;
       case 'house_fund':
         subUrl = 'persontax/v1/house-funds'
-        console.log('TITLE', this.data.title)
 
         if (this.data.house_type == "house_fund_loan") {
           newdata.type = 'loan'
@@ -1840,9 +1867,17 @@ Page({
               // this.showToast('请填写证照号码')
               // return
             } else if (this.data.isIdCard_owner && !format.isIDCardNum(formdata.owner_id_card_no)) {
-              this.showToast('身份证格式有误')
+              this.showToast('证照号码有误')
               return
             } 
+            if (this.data.cardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(formdata.owner_id_card_no)) {
+              this.showToast('证照号码有误');
+              return
+            }
+            if (this.data.cardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(formdata.owner_id_card_no)) {
+              this.showToast('证照号码有误');
+              return
+            }
             newdata.owner_id_card_type = this.data.cardtypeData.selected
           }
           // if (this.data.rentLocateInfo.address_value[0].length < 1) {
@@ -1900,7 +1935,16 @@ Page({
           } else if (this.data.isIdCard_lover && !format.isIDCardNum(formdata.spouse_id_card_no)) {
             this.showToast('配偶身份证格式有误')
             return
-          } else if (this.data.loverbirthDate.selected.length < 1) {
+          } 
+          if (this.data.lovercardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(formdata.spouse_id_card_no)) {
+            this.showToast('证照号码有误');
+            return
+          }
+          if (this.data.lovercardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(formdata.spouse_id_card_no)) {
+            this.showToast('证照号码有误');
+            return
+          }
+          if (this.data.loverbirthDate.selected.length < 1) {
             this.showToast('请选择配偶出生日期')
             return
           }

@@ -13,7 +13,7 @@
           <text class='text_777_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"  hidden='{{!isIdCard_child}}'></image>
-            <input class='input_wrap' style='color:#000;' placeholder='请输入证照号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' value='{{children_id_card_no}}' bindinput="idChange" bindblur="idDone" id='children_id_card_no_input'></input>
+            <input class='input_wrap' style='color:#000;' placeholder='请输入证照号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='20' value='{{children_id_card_no}}' bindinput="idChange" bindblur="idDone" id='children_id_card_no_input'></input>
           </view>
           <!-- <view wx:else>
               <input class='input_wrap' placeholder='请输入证照号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' type='idcard' value='{{children_id_card_no}}'></input>
@@ -142,7 +142,7 @@
     <text class='text_777_30 float_left'>被赡养人证照号码</text>
     <view>
       <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="older_id_card_no" hidden='{{!isIdCard_older}}'></image>
-      <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入证照号码' maxlength='18' name='id_card_no' value='{{id_card_no}}' bindinput="idChange" bindblur="idDone" id="older_id_card_no_input"></input>
+      <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入证照号码' maxlength='20' name='id_card_no' value='{{id_card_no}}' bindinput="idChange" bindblur="idDone" id="older_id_card_no_input"></input>
     </view>
   </view>
   <view class='divide_line_30'></view>
@@ -313,7 +313,7 @@
         <text class='text_777_30 float_left head_in'>证照号码</text>
         <view>
           <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="owner_id_card_no"  hidden='{{!isIdCard_owner}}'></image>
-          <input class='input_wrap' placeholder-class='text_999_30 float_right' style=' line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入证照号码' maxlength='18'   name='owner_id_card_no' value='{{owner_id_card_no}}' bindinput="idChange" bindblur="idDone"  id='owner_id_card_no_input'></input>
+          <input class='input_wrap' placeholder-class='text_999_30 float_right' style=' line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入证照号码' maxlength='20'   name='owner_id_card_no' value='{{owner_id_card_no}}' bindinput="idChange" bindblur="idDone"  id='owner_id_card_no_input'></input>
         </view>
       </view>
     </view>
@@ -372,7 +372,7 @@
       <text class='text_777_30 float_left head_in'>配偶证照号码</text>
       <view>
         <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden='{{!isIdCard_lover}}' id="spouse_id_card_no"></image><!--  hidden='{{hasGetLover || !isIdCard_lover}}' -->
-        <input class='input_wrap' style='color:#000;' placeholder='请输入证照号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' value='{{spouse_id_card_no}}' bindinput="idChange"  bindblur="idDone" id='spouse_id_card_no_input'></input><!-- disabled='{{hasGetLover}}' -->
+        <input class='input_wrap' style='color:#000;' placeholder='请输入证照号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='20' value='{{spouse_id_card_no}}' bindinput="idChange"  bindblur="idDone" id='spouse_id_card_no_input'></input><!-- disabled='{{hasGetLover}}' -->
       </view>
     </view>
     <view class='divide_line_30'></view>

@@ -58,8 +58,9 @@ Page({
       selectdata: options.select_data ? JSON.parse(options.select_data) : {}
     })
     if (options.type == '1' && options.select_data && JSON.parse(options.select_data)) {
-      this.handleData(JSON.parse(options.select_data))
+      this.handleData(JSON.parse(options.select_data), JSON.parse(options.complete_data))
     }
+    // 
   },
 
   /**
@@ -76,7 +77,7 @@ Page({
 
   },
 
-  handleData: function(data) {
+  handleData: function(data,completedata) {
     var selectarray = data.addition_items;
     console.log("handleData", data)
     var selectIndex = this.data.selectIndex;
@@ -88,19 +89,19 @@ Page({
       for (var i = 0; i < selectarray.length; i++) {
         if (selectarray[i].addition_category == 'children_education') { //子女教育
           selectIndex[0].sureid = true
-          selectIndex[0].disable_change = true
+          selectIndex[0].disable_change = completedata.indexOf('children_education')!=-1?true:false
         }
         if (selectarray[i].addition_category == 'continuing_education') { //继续教育
           selectIndex[1].sureid = true
-          selectIndex[1].disable_change = true
+          selectIndex[1].disable_change = completedata.indexOf('continuing_education') != -1 ? true : false
         }
         if (selectarray[i].addition_category == 'support_duty') { //赡养老人
           selectIndex[2].sureid = true
-          selectIndex[2].disable_change = true
+          selectIndex[2].disable_change = completedata.indexOf('support_duty') != -1 ? true : false
         }
         if (selectarray[i].addition_category == 'house_fund_rent') { //住房（租房）
           selectIndex[3].sureid = true
-          selectIndex[3].disable_change = true
+          selectIndex[3].disable_change = completedata.indexOf('house_fund_rent') != -1 ? true : false
           this.setData({
             flag_housing01: false,
             flag_housing02: true,
@@ -108,7 +109,7 @@ Page({
         }
         if (selectarray[i].addition_category == 'house_fund_loan') { //住房（租房）
           selectIndex[3].sureid = true
-          selectIndex[3].disable_change = true
+          selectIndex[3].disable_change = completedata.indexOf('house_fund_loan') != -1 ? true : false
           this.setData({
             flag_housing01: true,
             flag_housing02: false,

@@ -11,6 +11,7 @@ Page({
     is_declared: false,
     hascompleted:false,
     additionlist: [],
+    complete_item:[],
     declareStatus: {
       "to_declare ": "待申报",
       "declaring": "申报中",
@@ -53,7 +54,7 @@ Page({
     console.log("goupdate", e);
     var newdata = this.data.additionlist[e.currentTarget.id]
     wx.navigateTo({
-      url: 'godeclare/godeclare?legal_entity_id=' + newdata.legal_entity_id + "&legal_entity=" + newdata.legal_entity + "&select_data=" + JSON.stringify(newdata) + "&type=1",
+      url: 'godeclare/godeclare?legal_entity_id=' + newdata.legal_entity_id + "&legal_entity=" + newdata.legal_entity + "&select_data=" + JSON.stringify(newdata) + "&complete_data=" + JSON.stringify(this.data.complete_item) + "&type=1",
     })
   },
 
@@ -109,6 +110,7 @@ Page({
         if (res && res.data) {
           console.log("res", res)
           that.setData({
+            complete_item: res.data.complete_item,
             additionlist: that.handleData(res.data.items) 
           })
         }

@@ -9,7 +9,7 @@
           <!-- <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'> -->
           立即申报
         </view>
-        <view wx:elif="{{item.addition_items&&item.addition_items.length>0&&item.addition_items.length<4}}" class='view_godeclare_wrap' bindtap='goupdate' id='{{idx01}}'>
+        <view wx:elif="{{complete_item.length<4}}" class='view_godeclare_wrap' bindtap='goupdate' id='{{idx01}}'>
           查看并调整
         </view>
       </view>

@@ -120,6 +120,26 @@ Page({
     })
   },
 
+  loginout:function(){
+    wx.showModal({
+      title: '退出登录',
+      content: '确认要退出登录吗？',
+      confirmText: '确定',
+      showCancel: true,
+      cancelText:"取消",
+      confirmColor: '#357aeb',
+      success(res) {
+        console.log("loginout", res)
+        if (res.confirm) {
+          wx.reLaunch({
+            // url: '../../login/login'
+            url: '../../getPhone/getPhone'
+          })
+        }
+      }
+    })
+  },
+
   /**
    * 生命周期函数--监听页面隐藏
    */

@@ -55,9 +55,13 @@
         </view>
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
       </view> -->
+
+       <!-- <text style="font-size:34rpx;color:#999;text-align:center;padding:20rpx;margin:80rpx 0" bindtap='loginout'>退出登录</text> -->
     </view>
   </scroll-view>
-  
+
   <image class='chat-img' bindtap='gochat' src='/images/icon_chat.png'></image>
 
+   <image class='logout-img' bindtap='loginout' src='/images/icon_logout.png'></image>
+
 </view>

@@ -60,8 +60,16 @@ text_wrap_sub_999 {
 }
 
 .chat-img {
-  width: 96rpx;
-  height: 96rpx;
+  width: 80rpx;
+  height: 80rpx;
+  position: fixed;
+  right: 40rpx;
+  bottom: 140rpx;
+}
+
+.logout-img {
+  width: 80rpx;
+  height: 80rpx;
   position: fixed;
   right: 40rpx;
   bottom: 40rpx;

@@ -2,6 +2,8 @@
 var app = getApp();
 var format = require('../../../../utils/util.js');
 var baseUrl = app.globalData.baseUrl;
+const reg_18_Number = /^[0-9]{18}$/;
+const reg_9_n_a = /^([a-zA-z]|[0-9]){9}$/;
 // const cardTypeArray8 = ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
 const cardTypeArray = ['居民身份证', '中国护照', '港澳居民来往内地通行证', '港澳居民居住证', '台湾居民来往大陆通行证', '台湾居民居住证', '外国护照', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
 Page({
@@ -418,7 +420,13 @@ Page({
     if (this.data.card_number.length < 1) {
       this.showtoast('请填写证照号码');
       return
-    } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
+    } else if (this.data.isIdCard && !format.isIDCardNum(this.data.card_number)) {
+      this.showtoast('证照号码有误');
+      return
+    } else if (this.data.cardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(this.data.card_number)) {
+      this.showtoast('证照号码有误');
+      return
+    } else if (this.data.cardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(this.data.card_number)) {
       this.showtoast('证照号码有误');
       return
     }
@@ -519,12 +527,12 @@ Page({
       success: function(res) {
         console.log(res)
         wx.hideLoading()
-        if (res.statusCode == 200) {
+        if (res.statusCode < 300) {
           wx.navigateBack({
             delta: 1
           })
         } else {
-          that.showtoast(res.data.message)
+          that.showtoast(res.data.message ? res.data.message : '请求出错')
         }
       },
       fail(res) {
@@ -577,55 +585,106 @@ Page({
     //   })
     // }
   },
-
+  
   idChange: function (e) {
-    console.log('idCardNoChange', e.detail.value)
     var idCardNo = e.detail.value
     this.setData({
       card_number: idCardNo
     })
-    if (!this.data.isIdCard) {
-      return;
-    }
-    if (e.detail.value.length == 18){
-      if (!format.isIDCardNum(idCardNo)) {
-        wx.showToast({
-          image: "../../../../images/warn.png",
-          title: '身份证格式有误'
-        })
+    if (e.detail.value.length == 18) {
+      if (this.data.isIdCard && !format.isIDCardNum(idCardNo)) {
+        this.showtoast('证照号码有误');
         return;
       }
-      this.dealIdInfo(idCardNo)
+      if (this.data.isIdCard) {
+        this.dealIdInfo(idCardNo)
+        return;
+      }
+      if (this.data.cardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(idCardNo)) {
+        this.showtoast('证照号码有误');
+        return
+      }
     }
+    if (e.detail.value.length == 9) {
+      if (this.data.cardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(idCardNo)) {
+        this.showtoast('证照号码有误');
+        return
+      }
+    }
+   
   },
   idDone: function (e) {
     var idCardNo = e.detail.value
     this.setData({
       card_number: idCardNo
     })
-    if (!this.data.isIdCard) {
-      return;
-    }
     if (!idCardNo.length) {
-      wx.showToast({
-        image: "../../../../images/warn.png",
-        title: '请输入身份证号'
-      })
+      this.showtoast('请输入证照号码');
       return;
     }
-    if (!format.isIDCardNum(idCardNo)) {
-      wx.showToast({
-        image: "../../../../images/warn.png",
-        title: '身份证格式有误'
-      })
+    if (this.data.isIdCard && !format.isIDCardNum(idCardNo)) {
+      this.showtoast('证照号码有误');
       return;
     }
+    if (this.data.cardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(idCardNo)) {
+      this.showtoast('证照号码有误');
+      return
+    }
+    if (this.data.cardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(idCardNo)) {
+      this.showtoast('证照号码有误');
+      return
+    }
   },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function() {
+  deleteTap: function () {
+    var that = this
+    wx.showModal({
+      title: '提示',
+      content: '确认要删除吗？',
+      success(res) {
+        if (res.confirm) {
+          that.delete()
+        } else if (res.cancel) {
+        }
+      }
+    })
+  },
+  delete: function() {
+    if (!this.cur_id || this.cur_id.length<1) {
+      wx.navigateBack({
+        delta: 1
+      })
+      return
+    }
+    console.log('delete')
+    var that = this
+    var Authorization = app.globalData.Authorization;
+    var url = baseUrl + 'persontax/v1/personal-taxes/' + this.cur_id, method = "DELETE"
+    wx.showLoading({
+      title: '',
+    })
+    wx.request({
+      url: url,
+      method: method,
+      header: {
+        'content-type': 'application/json', // 默认值
+        "Authorization": Authorization
+      },
+      success: function (res) {
+        console.log(res)
+        wx.hideLoading()
+        if (res.statusCode < 300) {
+          wx.navigateBack({
+            delta: 1
+          })
+        } else {
+          that.showtoast(res.data.message ? res.data.message : '请求出错')
+        }
+      },
+      fail(res) {
+        console.log(res)
+        wx.hideLoading()
+      }
+    })
 
   },
 

@@ -27,7 +27,7 @@
              <input class='input_wrap' placeholder='请输入或拍摄身份证'  placeholder-class='text_999_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}' type='idcard' ></input>
           </view>
           <view wx:else>
-            <input class='input_wrap' placeholder='请输入证照号码'  placeholder-class='text_999_30' name='id_card_no' maxlength='30' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
+            <input class='input_wrap' placeholder='请输入证照号码'  placeholder-class='text_999_30' name='id_card_no' maxlength='20' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
           </view>
         </view>
         <view class="divide_line_30"></view>
@@ -63,9 +63,10 @@
         </view>
       </view>
     </view>
-
-    <view class="btn_bottom">
-      <button class="btn_bottom" formType="submit"> 保存</button>
+    
+    <view class="btn_left" bindtap='deleteTap'>删除</view>
+    <view class="btn_bottom_wrap">
+      <button class="btn_right" formType="submit">保存</button>
     </view>
   </form>
 </view>

@@ -127,4 +127,43 @@ input[disabled]{
   height: 40rpx;
   float: right;
   margin-top:24rpx;
+}
+
+.btn_left{
+  width: 40%;
+  z-index: 10000;
+  height: 82rpx;
+  text-align: center;
+  position: fixed;
+  color:  #666;
+  bottom: 0;
+  line-height: 82rpx;
+  background: #fff;
+  border: 1rpx solid #f5f5f5;
+ 
+}
+.btn_bottom_wrap{
+  width: 60%;
+  z-index: 10000;
+  height: 84rpx;
+  text-align: center;
+  position: fixed;
+  background:  #357aeb;
+  /* border: 1rpx solid #357aeb; */
+  bottom: 0;
+  line-height: 84rpx;
+  right: 0;
+}
+.btn_right{
+  width: 60%;
+  z-index: 10000;
+  height: 84rpx;
+  background: #357aeb;
+  text-align: center;
+  position: fixed;
+  color: #fff;
+  bottom: 0;
+  right: 0;
+  line-height: 84rpx;
+  border-color:  #357aeb;
 }
\ No newline at end of file

 var format = require('../../../../utils/util.js');
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
+const reg_18_Number = /^[0-9]{18}$/;
+const reg_9_n_a = /^([a-zA-z]|[0-9]){9}$/;
 // var countryInfo = require('../../../../utils/country.js');
 // const cardTypeArray = ['居民身份证', '中国护照', '港澳居民来往内地通行证', '港澳居民居住证', '台湾居民来往大陆通行证', '台湾居民居住证', '外国护照', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
 const cardTypeArray8 = ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
@@ -1077,41 +1079,48 @@ Page({
     this.setData({
       card_number: idCardNo
     })
-    if (!this.data.isIdCard) {
-      return;
-    }
     if (!idCardNo.length) {
-      wx.showToast({
-        image: "../../../../images/warn.png",
-        title: '请输入身份证号'
-      })
+      this.showtoast('请输入证照号码');
       return;
     }
-    if (!format.isIDCardNum(idCardNo)) {
-      wx.showToast({
-        image: "../../../../images/warn.png",
-        title: '身份证格式有误'
-      })
+    if (this.data.isIdCard && !format.isIDCardNum(idCardNo)) {
+      this.showtoast('证照号码有误');
       return;
     }
+    if (this.data.cardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(idCardNo)) {
+      this.showtoast('证照号码有误');
+      return
+    }
+    if (this.data.cardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(idCardNo)) {
+      this.showtoast('证照号码有误');
+      return
+    }
+    
   },
   bindinputcardnum: function(e) {
     var idCardNo = e.detail.value
     this.setData({
       card_number: idCardNo
     })
-    if (!this.data.isIdCard) {
-      return;
-    }
     if (e.detail.value.length == 18) {
-      if (!format.isIDCardNum(idCardNo)) {
-        wx.showToast({
-          image: "../../../../images/warn.png",
-          title: '身份证格式有误'
-        })
+      if (this.data.isIdCard && !format.isIDCardNum(idCardNo)) {
+        this.showtoast('证照号码有误');
         return;
+      } 
+      if (this.data.isIdCard){
+        this.dealIdInfo(idCardNo)
+        return;
+      }
+      if (this.data.cardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(idCardNo)) {
+        this.showtoast('证照号码有误');
+        return
+      }
+    }
+    if (e.detail.value.length == 9){
+      if (this.data.cardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(idCardNo)) {
+        this.showtoast('证照号码有误');
+        return
       }
-      this.dealIdInfo(idCardNo)
     }
   },
   //根据身份证号码，获取相关信息
@@ -1166,7 +1175,13 @@ Page({
     if (this.data.card_number.length < 1) {
       this.showtoast('请填写证照号码');
       return
-    } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
+    } else if (this.data.isIdCard && !format.isIDCardNum(this.data.card_number)) {
+      this.showtoast('证照号码有误');
+      return
+    } else if (this.data.cardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(this.data.card_number)) {
+      this.showtoast('证照号码有误');
+      return
+    } else if (this.data.cardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(this.data.card_number)) {
       this.showtoast('证照号码有误');
       return
     }
@@ -1208,7 +1223,13 @@ Page({
     if (this.data.hasOtherCard && !formdata.other_card_number.length) {
       this.showtoast('请输入其他证照号码');
       return
-    } 
+    } else if (this.data.otherCardtypeData.selected.indexOf('居住证') > -1 && !reg_18_Number.test(formdata.other_card_number)) {
+      this.showtoast('其他证照号码有误');
+      return
+    } else if (this.data.otherCardtypeData.selected.indexOf('中国护照') > -1 && !reg_9_n_a.test(formdata.other_card_number)) {
+      this.showtoast('其他证照号码有误');
+      return
+    }
     if (this.data.hasOtherCard && !this.data.birthCountryData.selected) {
       this.showtoast('请选择出生国家');
       return
@@ -1399,19 +1420,14 @@ Page({
       },
       success: function(res) {
         console.log(res)
-        if (res.statusCode == 200) {
+        if (res.statusCode < 300) {
           wx.navigateBack({
             delta:1
           })
-          // ({
-          //   url: '../home/home',
-          // })
-        } else if (res.data.code == 400){
-          if (res.data.errors.email){
-            that.showtoast('邮箱格式有误')
-          }else{
-            that.showtoast(res.data.message)
-          }
+        } else if (res.data.code == 400 && res.data.errors.email){
+          that.showtoast('邮箱格式有误')
+        } else {
+          that.showtoast(res.data.message ? res.data.message : '请求出错')
         }
       },
       fail(res) {

@@ -29,7 +29,7 @@
           <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' && 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='30' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
+            <input class='input_wrap' disabled="{{taxInfo.certification_status=='active' && taxInfo.id_card_no.length>0}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='20' bindblur='idcardblur' bindinput = 'bindinputcardnum'></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 class="divide_line_30"></view>
@@ -79,7 +79,7 @@
             <text class='red_star_right_10'>*</text>
             <text class='text_777_30 float_left' style='line-height: 90rpx'>其他证照号码</text>
             <view>
-              <input class='input_wrap' placeholder="请输入证照号码" value="{{other_card_number}}" name='other_card_number' maxlength='30'></input>
+              <input class='input_wrap' placeholder="请输入证照号码" value="{{other_card_number}}" name='other_card_number' maxlength='20'></input>
             </view>
           </view>
           <view class="divide_line_30"></view>

@@ -4,7 +4,7 @@
 		"ignore": []
 	},
 	"setting": {
-		"urlCheck": false,
+		"urlCheck": true,
 		"es6": true,
 		"postcss": true,
 		"minified": true,