优化

@@ -15,11 +15,12 @@ Page({
     id_card_no: "",
     id_card_no: "",
     birthday: "",
     birthday: "",
     datas: "",
     datas: "",
-    cardTypeArray : ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'],
-    countryArray:[],
-    countryAbleChoosed:false,
-    cardtype:"",
-    nation:"",
+    cardTypeArray: ['居民身份证', '中国护照', '港澳居民居住证', '台湾居民居住证', '外国人永久居留身份证', '外国人工作许可证（A类）', '外国人工作许可证（B类）', '外国人工作许可证（C类）'],
+    countryArray: [],
+    oricountryArray: [],
+    countryAbleChoosed: false,
+    cardtype: "",
+    nation: "",
     birthday_datelong: -1,
     birthday_datelong: -1,
   },
   },
 
 
@@ -43,6 +44,7 @@ Page({
         cardtype: curdata.id_card_type,
         cardtype: curdata.id_card_type,
         nation: curdata.nation,
         nation: curdata.nation,
         id_card_no: curdata.id_card_no,
         id_card_no: curdata.id_card_no,
+        countryAbleChoosed: '居民身份证' == curdata.id_card_type || '中国护照' == curdata.id_card_type ? true : false,
         birthday: curdata.birthday ? this.formatDate(curdata.birthday) : "",
         birthday: curdata.birthday ? this.formatDate(curdata.birthday) : "",
         birthday_datelong: curdata.birthday
         birthday_datelong: curdata.birthday
       })
       })
@@ -97,7 +99,7 @@ Page({
   },
   },
 
 
   //****************获取国籍数据************/
   //****************获取国籍数据************/
-  getCountry: function () {
+  getCountry: function() {
     var that = this
     var that = this
     wx.showLoading({
     wx.showLoading({
       title: '',
       title: '',
@@ -110,9 +112,9 @@ Page({
         'content-type': 'application/json', // 默认值
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
         "Authorization": Authorization
       },
       },
-      success: function (res) {
+      success: function(res) {
         var countrys = res.data.concat()
         var countrys = res.data.concat()
-        that.data.countryArray = res.data
+        that.data.oricountryArray = res.data
         if (countrys.indexOf('中国') > -1) {
         if (countrys.indexOf('中国') > -1) {
           countrys.splice(countrys.indexOf('中国'), 1);
           countrys.splice(countrys.indexOf('中国'), 1);
         }
         }
@@ -126,7 +128,7 @@ Page({
           countrys.splice(countrys.indexOf('澳门'), 1);
           countrys.splice(countrys.indexOf('澳门'), 1);
         }
         }
         that.setData({
         that.setData({
-          countryArray: countrys,
+          oricountryArray: countrys,
         })
         })
       },
       },
       fail(res) {
       fail(res) {
@@ -151,14 +153,14 @@ Page({
     if (!formdata.name || formdata.name.length < 1) {
     if (!formdata.name || formdata.name.length < 1) {
       this.showToast("请输入姓名")
       this.showToast("请输入姓名")
       return;
       return;
-    } 
-    if (this.data.cardtype.length<1){
+    }
+    if (this.data.cardtype.length < 1) {
       this.showToast("请选择证照类型")
       this.showToast("请选择证照类型")
       return;
       return;
-    }else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
+    } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
       this.showToast("请输入证件号码")
       this.showToast("请输入证件号码")
       return;
       return;
-    } else if (this.data.cardtype=='居民身份证'&&!format.isIDCardNum(formdata.id_card_no)) {
+    } else if (this.data.cardtype == '居民身份证' && !format.isIDCardNum(formdata.id_card_no)) {
       this.showToast("证件号码有误")
       this.showToast("证件号码有误")
       return;
       return;
     }
     }
@@ -182,11 +184,7 @@ Page({
         "id": that.data.supporter_id,
         "id": that.data.supporter_id,
         "legal_entity_id": that.data.legal_entity_id,
         "legal_entity_id": that.data.legal_entity_id,
         "co_supporter": formdata.name,
         "co_supporter": formdata.name,
-<<<<<<< HEAD
-        "id_card_type": "居民身份证",
-=======
         "id_card_type": that.data.cardtype,
         "id_card_type": that.data.cardtype,
->>>>>>> dev_wy
         "id_card_no": formdata.id_card_no,
         "id_card_no": formdata.id_card_no,
         "birthday": that.data.birthday_datelong,
         "birthday": that.data.birthday_datelong,
         "nation": that.data.nation,
         "nation": that.data.nation,
@@ -224,17 +222,36 @@ Page({
     })
     })
   },
   },
 
 
-  bindCardtypeChange:function(e){
+  bindCardtypeChange: function(e) {
     console.log('bindCardtypeChange', e)
     console.log('bindCardtypeChange', e)
     var card_type = this.data.cardTypeArray[e.detail.value]
     var card_type = this.data.cardTypeArray[e.detail.value]
+    var nation = this.data.nation
+    var countryAbleChoosed = this.data.countryAbleChoosed
+    var countryArray = this.data.oricountryArray
+
+    if ('居民身份证' == card_type || '中国护照' == card_type) {
+      nation = '中国'
+      countryAbleChoosed = true
+    } else if (card_type.indexOf("港澳") != -1) {
+      nation = ''
+      countryArray = ['中国香港', '中国澳门']
+      countryAbleChoosed = false
+    } else if (card_type.indexOf("台湾") != -1) {
+      nation = '中国台湾'
+      countryAbleChoosed = true
+    } else {
+      nation = ''
+      countryAbleChoosed = false
+    }
     this.setData({
     this.setData({
       cardtype: card_type,
       cardtype: card_type,
-      nation: card_type == "居民身份证" || card_type == "中国护照" ? "中国" : (this.data.nation == "中国" ? "" : this.data.nation),
-      countryAbleChoosed: card_type == "居民身份证" || card_type == "中国护照" ? true : false
+      nation: nation,
+      countryArray: countryArray,
+      countryAbleChoosed: countryAbleChoosed
     })
     })
   },
   },
 
 
-  bindnationChange: function (e) {
+  bindnationChange: function(e) {
     console.log('bindnationChange', e)
     console.log('bindnationChange', e)
     this.setData({
     this.setData({
       nation: this.data.countryArray[e.detail.value]
       nation: this.data.countryArray[e.detail.value]
@@ -253,7 +270,7 @@ Page({
   bindinput: function(e) {
   bindinput: function(e) {
     console.log("bindinput", e.detail.value)
     console.log("bindinput", e.detail.value)
     var idCardNo = e.detail.value
     var idCardNo = e.detail.value
-    if (this.data.cardtype=='居民身份证'&&idCardNo.length == 18) {
+    if (this.data.cardtype == '居民身份证' && idCardNo.length == 18) {
       if (!format.isIDCardNum(idCardNo)) {
       if (!format.isIDCardNum(idCardNo)) {
         wx.showToast({
         wx.showToast({
           image: "../../../../images/warn.png",
           image: "../../../../images/warn.png",