非居民信息：证照类型逻辑 、国籍、居民、时间、二证、出生、二名、地址

 var format = require('../../../../utils/util.js');
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
+// var countryInfo = require('../../../../utils/country.js');
+const cardTypeArray = ['居民身份证', '中国护照', '港澳居民来往内地通行证', '港澳居民居住证', '台湾居民来往大陆通行证', '台湾居民居住证', '外国护照', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
+const cardTypeDicts = [{ 'code': '1', 'name': '居民身份证' }, { 'code': '2', 'name': '中国护照' }, { 'code': '3', 'name': '港澳居民来往内地通行证' }, { 'code': '4', 'name': '港澳居民居住证' }, { 'code': '5', 'name': '台湾居民来往大陆通行证' }, { 'code': '6', 'name': '台湾居民居住证' }, { 'code': '7', 'name': '外国护照' }, { 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）'}];
 Page({
 
   /**
@@ -10,6 +13,7 @@ Page({
     isshow01: false,
     isshow02: false,
     isshow03: false,
+    hasOtherCard:false,
     taxInfo: {},
     proffessionlist: {},
     banklist: {},
@@ -44,21 +48,54 @@ Page({
     },
     cardtypeData: {
       isrequre: true,
-      disabled: true,
       label: '证照类型',
       bindtype: 'cardtype',
-      placeholder: '居民身份证',
+      placeholder: '请选择证照类型',
       selected: '',
-      values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
-        '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
-      ],
+      values: cardTypeDicts,
+      range_key:'name',
+      // values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
+      //   '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
+      // ],
       onChange: 'onPickerSelect'
-},
+    },
+    otherCardtypeData: {
+      label: '其他证照类型',
+      bindtype: 'other_cardtype',
+      placeholder: '请选择证照类型',
+      selected: '',
+      values: [],
+      range_key: 'name',
+      onChange: 'onPickerSelect'
+    },
+    countryData: {
+      label: '国籍',
+      bindtype: 'country',
+      isrequre: true,
+      selected: '',
+      // range_key:'name',
+      placeholder: '请选择国籍',
+      onChange: 'onPickerSelect',
+    },
+    birthCountryData: {
+      label: '出生国家（地区）',
+      bindtype: 'brith_country',
+      placeholder: '请选择国籍',
+      onChange: 'onPickerSelect',
+    },
+    taxpayerTypeData: {
+      isrequre: true,
+      label: '纳税人类型',
+      bindtype: 'taxpayerType',
+      placeholder: '请选择纳税人类型',
+      values: ["居民", "非居民"],
+      onChange: 'onPickerSelect'
+    },
     forignerInfo: {
       isrequre: true,
       label: '是否境外人员',
       bindtype: 'forigner',
-      placeholder: '否',
+      placeholder: '请选择',
       disabled: true,
       values: ["否", "是"],
       onChange: 'onPickerSelect'
@@ -74,7 +111,7 @@ Page({
     genderData: {
       label: '性别',
       bindtype: 'gender',
-      disabled: true,
+      // disabled: true,
       placeholder: '性别',
       values: ["男", "女"],
       selected: '',
@@ -160,13 +197,14 @@ Page({
     // 时间picker
     birthDate: {
       label: '出生年月',
-      disabled:true,
+      // disabled:true,
       bindtype: 'birthday',
       placeholder: '出生日期',
       selected: '',
       mode: "date",
       fields: "day",
       start: '1949-01-01',
+      end: format.formatTime_date(new Date()),
       onChange: 'birthdayChange',
     },
     startDate: {
@@ -189,10 +227,32 @@ Page({
       start: '2010-01-01',
       onChange: 'endChange',
     },
+
+    firstEntryDate: {
+      label: '首次入境时间',
+      isrequre: true,
+      bindtype: 'entry_date',
+      placeholder: '出生日期',
+      selected: '',
+      mode: "date",
+      fields: "day",
+      onChange: 'onPickerSelect',
+    },
+    predictLeaveDate: {
+      label: '预计离境时间',
+      isrequre: true,
+      bindtype: 'leave_date',
+      placeholder: '出生日期',
+      selected: '',
+      mode: "date",
+      fields: "day",
+      onChange: 'onPickerSelect',
+    },
     // 地址选择器
     contactaddressInfo: {
       label: '联系地址',
       mode: 'region',
+      maxWidth: 490,
       address_code: ['', '', ''],
       address_value: ['', '', ''],
       selected: '',
@@ -227,7 +287,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-
+    
     console.log('options.id', options.id)
     if (options.id && options.id.length > 0) {
       this.setData({
@@ -237,7 +297,44 @@ Page({
     }
     this.getproffessiondata()
     this.getbanklist()
+    this.getCountry()
   },
+//****************获取国籍数据************/
+  getCountry: function () {
+    var that = this
+    wx.showLoading({
+      title: '',
+    })
+    var Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/nation-list',
+      method: "GET",
+      header: {
+        'content-type': 'application/json', // 默认值
+        "Authorization": Authorization
+      },
+      success: function (res) {
+        console.log('country', res)
+        var countryData = that.data.countryData 
+        countryData.values = res.data.countrys
+        var birthCountryData = that.data.birthCountryData
+        birthCountryData.values = res.data.countrys
+        that.countrys = res.data.countrys
+        that.setData({
+          countryData: countryData,
+          birthCountryData: birthCountryData
+        })
+      },
+      fail(res) {
+        wx.hideLoading()
+      },
+      complete() {
+        wx.hideLoading()
+      }
+    })
+  },
+
+
 //****************获取自然人数据************/
   getpersonalTax: function(id) {
     var that = this
@@ -276,8 +373,10 @@ Page({
     //todo
     var curdate = format.curDateTime()
     console.log('curdate', curdate)
+    this.dealCardType(tax_info.id_card_type)//为防止干扰其他字段，需要先执行
 
     this.data.name = tax_info.name
+    this.data.other_name = tax_info.other_name
     if (tax_info.certification_status == 'active' && tax_info.id_card_no.length) {//已通过拍摄身份证认证过，不能修改
       this.data.genderData.disabled = true
       this.data.birthDate.disabled = true
@@ -285,10 +384,19 @@ Page({
     }
 
     this.data.personstatusData.selected = tax_info.taxpayer_status
-
-    this.data.cardtypeData.selected = tax_info.id_card_type
-    console.log('cardtypeData', this.data.cardtypeData)
+    this.data.cardtypeData.selected = cardTypeArray[parseInt(tax_info.id_card_type)-1]
+    this.data.cardtypeData.selected_code = tax_info.id_card_type
     this.data.card_number = tax_info.id_card_no
+
+    this.data.otherCardtypeData.selected = cardTypeArray[parseInt(tax_info.other_id_card_type)-1]
+    this.data.otherCardtypeData.selected_code = tax_info.other_id_card_type
+
+    this.data.other_card_number = tax_info.other_id_card_no
+    this.data.overseas = tax_info.is_overseas_personnel
+    this.data.countryData.selected = tax_info.native
+    this.data.birthCountryData.selected = tax_info.brith_native
+    this.data.taxpayerTypeData.selected = tax_info.taxpayer_type
+
     this.data.mobile = tax_info.mobile
     this.data.investInfo.selected = tax_info.is_investor
     this.data.specificIndustryInfo.selected = tax_info.is_specific_profession
@@ -309,6 +417,10 @@ Page({
     if (tax_info.separate_date > 1000) {
       this.data.endDate.selected = format.formatTime_date(tax_info.separate_date) 
     }
+    const firstEntryDate = format.formatTime_date(tax_info.first_entry_date)
+    const predictLeaveDate = format.formatTime_date(tax_info.predict_leave_date)
+    this.data.firstEntryDate.selected = (firstEntryDate.indexOf("NaN") == -1) ? firstEntryDate:''
+    this.data.predictLeaveDate.selected = (predictLeaveDate.indexOf("NaN") == -1) ? predictLeaveDate : ''
 
     this.data.professionData.selected = tax_info.profession.three_level_name
 
@@ -320,16 +432,18 @@ Page({
     this.data.lieshuInfo.selected = tax_info.is_martyr_family
     this.data.lonelyolderInfo.selected = tax_info.is_lonely_man
     this.data.bankInfo.selected = tax_info.bank
-    // this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district
+    this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district
     this.data.currentaddressInfo.selected = tax_info.current_address.province + tax_info.current_address.city + tax_info.current_address.district
     this.data.birthaddressInfo.selected = (tax_info.huji_address.province + tax_info.huji_address.city + tax_info.huji_address.district).replace(/(^\s*)|(\s*$)/g, "")
     this.data.employeeInfo.selected = tax_info.is_employee
     this.data.investpersonalInfo.selected = tax_info.is_business_angel
     this.setData({
-      huji_address_detail: tax_info.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
+      // huji_address_detail: tax_info.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
       name: this.data.name,
+      other_name: this.data.other_name,
       personstatusData: this.data.personstatusData,
       cardtypeData: this.data.cardtypeData,
+      otherCardtypeData: this.data.otherCardtypeData,
       mobile: this.data.mobile,
       investInfo: this.data.investInfo,
       specificIndustryInfo: this.data.specificIndustryInfo,
@@ -355,9 +469,15 @@ Page({
       startDate: this.data.startDate,
       long_end_date: tax_info.separate_date ? tax_info.separate_date : 0,
       endDate: this.data.endDate,
+      firstEntryDate: this.data.firstEntryDate,
+      predictLeaveDate: this.data.predictLeaveDate,
       isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
-      card_number: this.data.card_number
-
+      card_number: this.data.card_number,
+      other_card_number: this.data.other_card_number,
+      countryData: this.data.countryData,
+      birthCountryData: this.data.birthCountryData,
+      overseas: this.data.overseas,
+      taxpayerTypeData: this.data.taxpayerTypeData
     })
 
   },
@@ -512,8 +632,9 @@ Page({
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
           }
 
-          var cardtype_Data = that.data.cardtypeData
-          cardtype_Data.selected = '居民身份证'
+          var cardtypeData = that.data.cardtypeData
+          cardtypeData.selected = '居民身份证'
+          cardtypeData.selected_code = '1'
           var gender_Data = that.data.genderData
           gender_Data.selected = id_info.gender
 
@@ -535,7 +656,7 @@ Page({
             idInfoData: id_info,
             name: id_info.name,
             birthday: birth_day,
-            cardtypeData: cardtype_Data,
+            cardtypeData: cardtypeData,
             genderData: gender_Data,
             long_birth_date: Date.parse(new Date(birth_day)) / 1000,
             birthDate: that.data.birthDate,
@@ -572,6 +693,81 @@ Page({
 
   },
 
+  dealCardType: function (new_type_code){
+    console.log('cardtype_code', new_type_code)
+    var is_idcard = this.data.isIdCard
+    const new_type = cardTypeArray[parseInt(new_type_code)-1]
+    this.data.cardtypeData.selected_code = new_type_code
+    this.data.cardtypeData.selected = new_type
+
+    if ('居民身份证' == new_type) {
+      is_idcard = true
+      this.data.genderData.disabled = true
+      this.data.birthDate.disabled = true
+    } else {
+      is_idcard = false
+      this.data.genderData.disabled = false
+      this.data.birthDate.disabled = false
+    }
+    this.data.hasOtherCard = true
+    this.data.overseas = '否'
+    this.data.taxpayerTypeData.disabled = false
+    this.data.taxpayerTypeData.selected = ''
+    if ('居民身份证' == new_type || '中国护照' == new_type) {
+      this.data.countryData.selected = '中国'
+      this.data.countryData.disabled = true
+      this.data.hasOtherCard = false
+      this.data.taxpayerTypeData.selected = '居民'
+      this.data.taxpayerTypeData.disabled = true
+    } else if (new_type.indexOf("港澳") != -1) {
+      this.data.countryData.values = ['中国香港', '中国澳门']
+      this.data.countryData.selected = ''
+      this.data.countryData.disabled = false
+      this.data.nameText = '英文名'
+      if (new_type.indexOf('通行证') != -1){
+        this.data.otherCardtypeData.values = [{ 'code': '4', 'name': '港澳居民居住证'}];
+      }else{
+        this.data.otherCardtypeData.values = [{ 'code': '3', 'name': '港澳居民来往内地通行证'}];
+      }
+    } else if (new_type.indexOf("台湾") != -1) {
+      this.data.countryData.selected = '中国台湾'
+      this.data.countryData.disabled = true
+      this.data.nameText = '英文名'
+      if (new_type.indexOf('通行证') != -1) {
+        this.data.otherCardtypeData.values = [{ 'code': '6', 'name': '台湾居民居住证' }];
+      } else {
+        this.data.otherCardtypeData.values = [{ 'code': '5', 'name': '台湾居民来往大陆通行证' }];
+      }
+
+    } else {
+      this.data.overseas = '是'
+      this.data.countryData.selected = ''
+      this.data.countryData.values = this.countrys ? this.countrys : []
+      this.data.countryData.disabled = false
+      this.data.nameText = '中文名'
+      if (new_type.indexOf("外国护照") != -1) {
+        this.data.otherCardtypeData.values = [{ 'code': '8', 'name': '外国人永久居留身份证' }, { 'code': '9', 'name': '外国人工作许可证（A类）' }, { 'code': '10', 'name': '外国人工作许可证（B类）' }, { 'code': '11', 'name': '外国人工作许可证（C类）' }];
+      } else {
+        this.data.otherCardtypeData.values = [{ 'code': '7', 'name': '外国护照' }];
+      }
+    }
+    this.setData({
+      isIdCard: is_idcard,
+      hasOtherCard: this.data.hasOtherCard,
+      genderData: this.data.genderData,
+      birthDate: this.data.birthDate,
+      countryData: this.data.countryData,
+      cardtypeData: this.data.cardtypeData,
+      otherCardtypeData: this.data.otherCardtypeData,
+      nameText: this.data.nameText,
+      overseas: this.data.overseas,
+      taxpayerTypeData: this.data.taxpayerTypeData
+    })
+    
+    
+  },
+
+
   onPickerSelect: function(e) {
     console.log('picker发送选择改变，携带值为', e)
     switch (e.currentTarget.id) {
@@ -583,24 +779,57 @@ Page({
         })
         break;
       case 'cardtype':
-        var cardtype_data = this.data.cardtypeData
-        var new_type = cardtype_data.values[e.detail.value]
-        console.log('cardtype', cardtype_data.values[e.detail.value])
-        if (new_type != this.data.cardtypeData.selected) {
-          var is_idcard = this.data.isIdCard
-          cardtype_data.selected = cardtype_data.values[e.detail.value]
-          if (0 == e.detail.value) {
-            is_idcard = true
-          } else {
-            is_idcard = false
-          }
+        var cardtypeData = this.data.cardtypeData
+        var new_type = cardtypeData.values[e.detail.value]['name']
+        var new_type_code = cardtypeData.values[e.detail.value]['code']
+        if (new_type != cardtypeData.selected) {
+          this.dealCardType(new_type_code)
+          this.setData({
+            card_number: ""
+          })
+        }
+        break;
+      case 'other_cardtype':
+        var otherCardtypeData = this.data.otherCardtypeData
+        var new_type = otherCardtypeData.values[e.detail.value]['name']
+        var new_type_code = otherCardtypeData.values[e.detail.value]['code']
+
+        if (new_type != otherCardtypeData.selected) {
+          otherCardtypeData.selected = new_type
+          otherCardtypeData.selected_code = new_type_code
+          this.setData({
+            other_card_number: "",
+            otherCardtypeData: this.data.otherCardtypeData
+          })
+        }
+        break;
+      case 'country':
+        var countryData = this.data.countryData
+        var new_country = countryData.values[e.detail.value]
+        if (new_country != countryData.selected) {
+          countryData.selected = new_country
+          this.setData({
+            countryData: countryData
+          })
+        }
+        break;
+      case 'brith_country':
+        var birthCountryData = this.data.birthCountryData
+        var new_country = birthCountryData.values[e.detail.value]
+        if (new_country != birthCountryData.selected) {
+          birthCountryData.selected = new_country
           this.setData({
-            card_number:"",
-            isIdCard: is_idcard,
-            cardtypeData: cardtype_data
+            birthCountryData: birthCountryData
           })
         }
         break;
+      case 'taxpayerType':
+        var taxpayerTypeData = this.data.taxpayerTypeData
+          taxpayerTypeData.selected = taxpayerTypeData.values[e.detail.value]
+        this.setData({
+          taxpayerTypeData: taxpayerTypeData
+        })
+        break;
       case 'forigner':
         var forigner_data = this.data.forignerInfo
         forigner_data.selected = forigner_data.values[e.detail.value]
@@ -689,6 +918,25 @@ Page({
           investpersonalInfo: investpersonal_data
         })
         break;
+      case 'entry_date':
+        this.data.firstEntryDate.selected = e.detail.value
+        this.data.firstEntryDate.datelong = Date.parse(new Date(e.detail.value)) / 1000
+        this.data.predictLeaveDate.start = e.detail.value
+        if (this.data.firstEntryDate.datelong>this.data.predictLeaveDate.datelong){
+          this.data.predictLeaveDate.selected = ''
+        }
+        this.setData({
+          firstEntryDate: this.data.firstEntryDate,
+          predictLeaveDate: this.data.predictLeaveDate
+        })
+        break;
+      case 'leave_date':
+        this.data.predictLeaveDate.selected = e.detail.value
+        this.data.predictLeaveDate.datelong = Date.parse(new Date(e.detail.value)) / 1000
+        this.setData({
+          predictLeaveDate: this.data.predictLeaveDate
+        })
+        break;
     }
 
   },
@@ -786,12 +1034,19 @@ Page({
       name: e.detail.value
     })
   },
-
+  bindOtherName: function(e) {
+    this.setData({
+      other_name: e.detail.value
+    })
+  },
   idcardblur: 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",
@@ -812,6 +1067,9 @@ Page({
     this.setData({
       card_number: idCardNo
     })
+    if (!this.data.isIdCard) {
+      return;
+    }
     if (e.detail.value.length == 18) {
       if (!format.isIDCardNum(idCardNo)) {
         wx.showToast({
@@ -858,7 +1116,6 @@ Page({
   },
 
   formSubmit: function(e) {
-    console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
     var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,20}[a-z0-9]+$");
     var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$/;
     var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
@@ -880,6 +1137,19 @@ Page({
       this.showtoast('请输入正确姓名');
       return
     } 
+    if (this.data.countryData.selected.length < 1) {
+      this.showtoast('请选择国籍');
+      return
+    }
+    if (this.data.hasOtherCard && !this.data.firstEntryDate.datelong) {
+      this.showtoast('请选择首次入境时间');
+      return
+    } 
+    if (this.data.hasOtherCard && !this.data.predictLeaveDate.datelong) {
+      this.showtoast('请选择预计离境时间');
+      return
+    }
+
     if (this.data.mobile.length < 1) {
       this.showtoast('请输入手机号码');
       return
@@ -899,11 +1169,16 @@ Page({
         return
       }
     }
-    
-    // if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
-    //   this.showtoast('邮箱格式有误');
-    //   return
-    // }
+    if (this.data.contactAddress_haschanged || this.data.taxInfo.contact_address.province_code) {//选择了地址
+      if (formdata.contact_address_detail.length < 1) {
+        this.showtoast('请填写详细联系地址');
+        return
+      }
+    }
+    if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
+      this.showtoast('邮箱格式有误');
+      return
+    }
     // if (formdata.email && formdata.email.length > 0 && !format.checkEmail(formdata.email)) {
     //   this.showtoast('邮箱格式有误');
     //   return
@@ -988,15 +1263,19 @@ Page({
       data: {
         'certification_status': that.getCertifyStatus(formdata),
         "name": that.data.name,
+        "other_name": that.data.other_name,
         "family_ties": '本人',//that.data.relativeData.selected,
-        "native": "中国",
-        "taxpayer_type":"居民",
-        "is_overseas_personnel": "否",
-        "id_card_type": that.data.cardtypeData.selected,
+        "native": that.data.countryData.selected,
+        "taxpayer_type": that.data.taxpayerTypeData.selected,
+        "is_overseas_personnel": that.data.overseas,
+        "id_card_type": ''+that.data.cardtypeData.selected_code,
         "id_card_no": that.data.card_number,
+        "other_id_card_type": that.data.otherCardtypeData.selected_code,
+        "other_id_card_no": that.data.other_card_number,
         "gender": that.data.genderData.selected,
         "birth_date": that.data.long_birth_date,
-
+        "first_entry_date": that.data.firstEntryDate.datelong,
+        "predict_leave_date": that.data.predictLeaveDate.datelong,
         "mobile": that.data.mobile,
         "current_address": request_current_address,
         "current_address_detail": formdata.current_address_detail,
@@ -1017,8 +1296,8 @@ Page({
         "is_lonely_man": that.data.lonelyolderInfo.selected,
         "comment": formdata.comment,
         
-        // "contact_address": request_contact_address ? request_contact_address : that.data.taxInfo.contact_address_detail,
-        // "contact_address_detail": formdata.contact_address_detail.length > 0 ? formdata.contact_address_detail : that.data.taxInfo.contact_address_detail,
+        "contact_address": request_contact_address,
+        "contact_address_detail": formdata.contact_address_detail,
         
         // "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : this.data.taxInfo.join_date,
         // "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : this.data.taxInfo.separate_date,

@@ -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='18' bindblur='idcardblur' bindinput = 'bindinputcardnum' type='idcard'></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='30' bindblur='idcardblur' bindinput = 'bindinputcardnum' type="{{isIdCard?'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>
@@ -42,27 +42,53 @@
           <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap' placeholder="{{name}}" disabled="true" bindblur='bindinputname' style='line-height: 90rpx'></input> -->
         </view>
         <view class="divide_line_30"></view>
+        <template is="picker_cell_normal" data="{{...countryData}}" />
 
-        <view class='item_body'>
+        <!-- <view class='item_body'>
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx'>中国</text>
-        </view>
+        </view> -->
         <view class="divide_line_30"></view>
-        <view class='item_body'>
+        <template is="picker_cell_normal" data="{{...taxpayerTypeData}}" />
+        <!-- <view class='item_body'>
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left' style='line-height: 90rpx'>纳税人类型</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx'>居民</text>
-        </view>
+        </view> -->
         <view class="divide_line_30"></view>
         <view class='item_body'>
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left' style='line-height: 90rpx'>是否境外人员</text>
-          <text class='text_black_30 float_right' style='line-height: 90rpx'>否</text>
-        </view>
-        <view class="divide_line_30"></view>
-        
+          <text class='text_black_30 float_right' style='line-height: 90rpx'>{{overseas}}</text>
+        </view>  
+        <view wx:if='{{hasOtherCard}}'>
+          <view class="divide_line_30"></view>
+          <template is="picker_cell_normal" data="{{...firstEntryDate}}" />
+          <view class="divide_line_30"></view>
+          <template is="picker_cell_normal" data="{{...predictLeaveDate}}" />
+        </view>      
         <view hidden='{{!isshow01}}'>
+          <view wx:if='{{hasOtherCard}}'>
+            <view class="divide_line_30"></view>
+            <template is="picker_cell_normal" data="{{...otherCardtypeData}}" />
+            <view class="divide_line_30"></view>
+            <view class='item_body'>
+              <!-- <text class='red_star_right_10'>*</text> -->
+              <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>其他证照号码</text>
+              <view>
+                <input class='input_wrap' placeholder="请输入证照号码" value="{{other_card_number}}" name='other_id_card_no' maxlength='30'></input>
+              </view>
+            </view>
+            <view class="divide_line_30"></view>
+            <template is="picker_cell_normal" data="{{...birthCountryData}}" />
+            <view class="divide_line_30"></view>
+            <view class='item_body'>
+              <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>{{nameText}}</text>
+              <input class='input_wrap' placeholder="请输入{{nameText}}" value='{{other_name}}' bindblur='bindOtherName' style='line-height: 90rpx'></input>
+            </view>
+
+          </view>
           <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...genderData}}" />
           <view class="divide_line_30"></view>
@@ -108,10 +134,19 @@
           <view class="divide_line_30"></view>
           <view class='item_body '>
             <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>详细地址</text>
-            <input class='input_wrap ' name='huji_address_detail' placeholder-class='text_999_30' placeholder='请输入详细户籍地址' value='{{huji_address_detail}}'></input>
+            <input class='input_wrap ' name='huji_address_detail' placeholder-class='text_999_30' placeholder='请输入详细户籍地址' value='{{taxInfo.huji_address_detail}}'></input>
           </view>
           <view class="divide_line_30"></view>
-
+          <view  wx:if='{{hasOtherCard}}' >
+            <template is="picker_cell_normal" data="{{...contactaddressInfo}}" />
+            <view class="divide_line_30"></view>
+            <view class='item_body '>
+              <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>详细地址</text>
+              <input class='input_wrap ' name='contact_address_detail' placeholder-class='text_999_30' placeholder='请输入详细联系地址' value='{{taxInfo.contact_address_detail}}'></input>
+            </view>
+            <view class="divide_line_30"></view>
+          </view>
+          
           <view class='item_body'>
             <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>电子邮箱</text>
             <input class='input_wrap' name='email' value='{{taxInfo.email}}' placeholder='请输入电子邮箱' placeholder-class='text_999_30' maxlength='32'></input>