开启 家庭成员非居民逻辑，外籍修改

@@ -24,7 +24,6 @@ Page({
     requestBody: {},
     requestBody: {},
     idInfoData: '',
     idInfoData: '',
     profession_index: [],
     profession_index: [],
-    overseas:'否',
     relativeData: {
     relativeData: {
       isrequre: true,
       isrequre: true,
       label: '与本人关系',
       label: '与本人关系',
@@ -38,8 +37,7 @@ Page({
     },
     },
     cardtypeData: {
     cardtypeData: {
       isrequre: true,
       isrequre: true,
-      disabled: true,
-      selected:'居民身份证',
+      // selected:'居民身份证',
       label: '证照类型',
       label: '证照类型',
       bindtype: 'cardtype',
       bindtype: 'cardtype',
       placeholder: '请选择证照类型',
       placeholder: '请选择证照类型',
@@ -52,7 +50,7 @@ Page({
       isrequre: true,
       isrequre: true,
       label: '是否境外人员',
       label: '是否境外人员',
       bindtype: 'forigner',
       bindtype: 'forigner',
-      placeholder: '否',
+      placeholder: '是否境外人员',
       disabled: true,
       disabled: true,
       values: ["否", "是"],
       values: ["否", "是"],
       onChange: 'onPickerSelect'
       onChange: 'onPickerSelect'
@@ -72,7 +70,7 @@ Page({
       label: '国籍',
       label: '国籍',
       bindtype: 'country',
       bindtype: 'country',
       isrequre: true,
       isrequre: true,
-      selected: '中国',
+      // selected: '中国',
       disabled: true,
       disabled: true,
       // range_key:'name',
       // range_key:'name',
       placeholder: '请选择国籍',
       placeholder: '请选择国籍',
@@ -174,7 +172,7 @@ Page({
     this.data.genderData.selected = tax_info.gender
     this.data.genderData.selected = tax_info.gender
     this.data.countryData.selected = tax_info.native
     this.data.countryData.selected = tax_info.native
     // this.data.genderData.disabled = isDisable
     // this.data.genderData.disabled = isDisable
-    
+    this.data.forignerInfo.selected = tax_info.is_overseas_personnel
     this.setData({
     this.setData({
       isDisable: isDisable,
       isDisable: isDisable,
       relativeData: this.data.relativeData,
       relativeData: this.data.relativeData,
@@ -185,7 +183,8 @@ Page({
       genderData: this.data.genderData,
       genderData: this.data.genderData,
       isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
       isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
       card_number: tax_info.id_card_no,
       card_number: tax_info.id_card_no,
-      countryData: this.data.countryData
+      countryData: this.data.countryData,
+      forignerInfo: this.data.forignerInfo
     })
     })
     // this.dealIdInfo(tax_info.id_card_no)//处理了性别和年龄
     // this.dealIdInfo(tax_info.id_card_no)//处理了性别和年龄
   },
   },
@@ -268,8 +267,9 @@ Page({
       is_idcard = false
       is_idcard = false
       this.data.genderData.disabled = false
       this.data.genderData.disabled = false
     }
     }
-    this.data.overseas = '否'
+    this.data.forignerInfo.selected = '是'
     if ('居民身份证' == new_type || '中国护照' == new_type) {
     if ('居民身份证' == new_type || '中国护照' == new_type) {
+      this.data.forignerInfo.selected = '否'
       this.data.countryData.selected = '中国'
       this.data.countryData.selected = '中国'
       this.data.countryData.disabled = true
       this.data.countryData.disabled = true
     } else if (new_type.indexOf("港澳") != -1) {
     } else if (new_type.indexOf("港澳") != -1) {
@@ -280,7 +280,6 @@ Page({
       this.data.countryData.selected = '中国台湾'
       this.data.countryData.selected = '中国台湾'
       this.data.countryData.disabled = true
       this.data.countryData.disabled = true
     } else {
     } else {
-      this.data.overseas = '是'
       this.data.countryData.selected = ''
       this.data.countryData.selected = ''
       this.data.countryData.values = this.countrys ? this.countrys : []
       this.data.countryData.values = this.countrys ? this.countrys : []
       this.data.countryData.disabled = false
       this.data.countryData.disabled = false
@@ -290,7 +289,7 @@ Page({
       genderData: this.data.genderData,
       genderData: this.data.genderData,
       countryData: this.data.countryData,
       countryData: this.data.countryData,
       cardtypeData: this.data.cardtypeData,
       cardtypeData: this.data.cardtypeData,
-      overseas: this.data.overseas,
+      forignerInfo: this.data.forignerInfo
     })
     })
 
 
 
 
@@ -463,7 +462,7 @@ Page({
         //"age": formdata.age ? formdata.age : '',//不传
         //"age": formdata.age ? formdata.age : '',//不传
         "age": formdata.age ? formdata.age : '',
         "age": formdata.age ? formdata.age : '',
         "native": that.data.countryData.selected,
         "native": that.data.countryData.selected,
-        "is_overseas_personnel": that.data.overseas,
+        "is_overseas_personnel": that.data.forignerInfo.selected,
       },
       },
       header: {
       header: {
         'content-type': 'application/json', // 默认值
         'content-type': 'application/json', // 默认值

@@ -54,12 +54,7 @@
           <text class='text_black_30 float_right' 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="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' >{{overseas}}</text>
-        </view>
-        <!-- <template is="picker_cell_normal" data="{{...forignerInfo}}" /> -->
+        <template is="picker_cell_normal" data="{{...forignerInfo}}" />
         <view class="divide_line_30"></view>
         <view class="divide_line_30"></view>
         <view class='item_body'>
         <view class='item_body'>
           <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>联系电话</text>
           <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>联系电话</text>