家庭成员 非居民逻辑 + 出生日期

@@ -2,8 +2,8 @@
 var app = getApp();
 var format = require('../../../../utils/util.js');
 var baseUrl = app.globalData.baseUrl;
-const cardTypeArray8 = ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
-
+// const cardTypeArray8 = ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
+const cardTypeArray = ['居民身份证', '中国护照', '港澳居民来往内地通行证', '港澳居民居住证', '台湾居民来往大陆通行证', '台湾居民居住证', '外国护照', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'];
 Page({
   cur_id:null,
   /**
@@ -41,7 +41,7 @@ Page({
       label: '证照类型',
       bindtype: 'cardtype',
       placeholder: '请选择证照类型',
-      values: cardTypeArray8,
+      values: cardTypeArray,
       // values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照','外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'],
       // range_key: 'name',
       onChange: 'onPickerSelect'
@@ -76,6 +76,17 @@ Page({
       placeholder: '请选择国籍',
       onChange: 'onPickerSelect',
     },
+    birthDate: {
+      label: '出生日期',
+      isrequre: true,
+      bindtype: 'birthday',
+      placeholder: '出生日期',
+      selected: '',
+      mode: "date",
+      fields: "day",
+      end: format.curDateTime(),
+      onChange: 'birthdayChange',
+    },
   },
 
   /**
@@ -118,7 +129,7 @@ Page({
           countrys.splice(countrys.indexOf('澳门'), 1);
         }
         that.countrys = countrys
-        if (that.data.cardtypeData.selected && that.data.cardtypeData.selected.indexOf("外国人") != -1) {
+        if (that.data.cardtypeData.selected && that.data.cardtypeData.selected.indexOf("外国") != -1) {
           that.data.countryData.values = countrys
           that.setData({
             countryData: that.data.countryData,
@@ -174,14 +185,24 @@ Page({
     this.data.relativeData.selected = tax_info.family_ties
     this.data.genderData.selected = tax_info.gender
     this.data.countryData.selected = tax_info.native
-    // this.data.genderData.disabled = isDisable
+    if (isDisable){//否的话受证照类型控制
+      this.data.birthDate.disabled = true
+      this.data.genderData.disabled = true
+    }
     this.data.forignerInfo.selected = tax_info.is_overseas_personnel
+    if (tax_info.birth_date == -62135596800 || tax_info.birth_date == 0) {
+      this.data.birthDate.selected = ''
+    } else {
+      this.data.birthDate.selected = tax_info.birth_date_str //format.formatTime_date(tax_info.birth_date) 
+    }
     this.setData({
       isDisable: isDisable,
       relativeData: this.data.relativeData,
       name: tax_info.name,
       cardtypeData: this.data.cardtypeData,
-      age: tax_info.age,
+      // age: tax_info.age,
+      long_birth_date: tax_info.birth_date,
+      birthDate: this.data.birthDate,
       mobile: tax_info.mobile,
       genderData: this.data.genderData,
       isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
@@ -227,7 +248,7 @@ Page({
           var gender_Data = that.data.genderData
           gender_Data.selected = id_info.gender
 
-          // that.data.birthDate.selected = birth_day
+          that.data.birthDate.selected = birth_day
 
           // if (that.data.name.length > 0 && id_info.name != that.data.name) {
           //   that.showtoast("姓名冲突")
@@ -240,11 +261,11 @@ Page({
           that.setData({
             idInfoData: id_info,
             name: id_info.name,
-            // birthday: birth_day,
+            birthday: birth_day,
             cardtypeData: cardtype_Data,
             genderData: gender_Data,
-            // long_birth_date: Date.parse(new Date(birth_day)) / 1000,
-            // birthDate: that.data.birthDate,
+            long_birth_date: Date.parse(new Date(birth_day)) / 1000,
+            birthDate: that.data.birthDate,
             card_number: id_info.id_card_number
           })
           that.dealIdInfo(id_info.id_card_number)
@@ -266,9 +287,11 @@ Page({
     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.forignerInfo.selected = '是'
     if ('居民身份证' == new_type || '中国护照' == new_type) {
@@ -289,6 +312,7 @@ Page({
     }
     this.setData({
       isIdCard: is_idcard,
+      birthDate: this.data.birthDate,
       genderData: this.data.genderData,
       countryData: this.data.countryData,
       cardtypeData: this.data.cardtypeData,
@@ -298,7 +322,15 @@ Page({
 
   },
 
-
+  birthdayChange: function (e) {
+    var birth_date = this.data.birthDate;
+    birth_date.selected = e.detail.value
+    console.log('birthdayChange', Date.parse(new Date(e.detail.value)))
+    this.setData({
+      long_birth_date: Date.parse(new Date(e.detail.value)) / 1000,
+      birthDate: birth_date
+    })
+  },
   // =============普通单列picker选中处理==============
   onPickerSelect: function(e) {
     console.log('picker发送选择改变，携带值为', e)
@@ -414,18 +446,23 @@ Page({
         return
       }
     }
-    if (!formdata.age) {
-      this.showtoast('请填写年龄');
+    // if (!formdata.age) {
+    //   this.showtoast('请填写年龄');
+    //   return
+    // } 
+    if (this.data.birthDate.selected.length < 1) {
+      this.showtoast('请选择出生日期');
       return
     } else {
+      var age = format.getAge(this.data.birthDate.selected)
       var host_birth = format.formatTime_date(app.globalData.hostInfo.birth_date) 
       var host_age = format.getAge(host_birth)
       console.log('host_age',host_age,'hostInfo', app.globalData.hostInfo)
-      if ((rel == '子' || rel == '女') && formdata.age > host_age) {
+      if ((rel == '子' || rel == '女') && age > host_age) {
         this.showtoast('子女年龄有误');
         return
       }
-      if (rel == '父母' && formdata.age < host_age) {
+      if (rel == '父母' && age < host_age) {
         this.showtoast('父母年龄有误');
         return
       }
@@ -462,8 +499,8 @@ Page({
         "name": name,
         "gender": that.data.genderData.selected,
         "mobile": formdata.mobile,
-        //"age": formdata.age ? formdata.age : '',//不传
-        "age": formdata.age ? formdata.age : '',
+        // "age": formdata.age ? formdata.age : '',
+        "birth_date": that.data.long_birth_date,
         "native": that.data.countryData.selected,
         "is_overseas_personnel": that.data.forignerInfo.selected,
       },
@@ -499,8 +536,8 @@ Page({
     var cardtype = this.data.cardtypeData.selected;
     var card_no = formdata.id_card_no ? formdata.id_card_no : this.data.card_number;
     var gender = this.data.genderData.selected;
-    //var birth_day = this.data.birthDate.selected;
-    if (name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender ){// && birth_day == this.data.birthday) {
+    var birth_day = this.data.birthDate.selected;
+    if (name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender && birth_day == this.data.birthday) {
       return 'active'
     } else {
       return ''
@@ -520,8 +557,11 @@ Page({
     var info = format.analyzeIDCard(idCardNum)
     console.log('info', info.age, info.sex)
     if (info.age) {
+      this.data.birthDate.selected = info.birthDay
       this.setData({
-        age: info.age
+        age: info.age,
+        long_birth_date: Date.parse(new Date(info.birthDay)) / 1000,
+        birthDate: this.data.birthDate
       })
     }
     if (info.sex) {