优化自然人

@@ -85,7 +85,7 @@ Page({
       isrequre: true,
       isrequre: true,
       label: '出生国家（地区）',
       label: '出生国家（地区）',
       bindtype: 'brith_country',
       bindtype: 'brith_country',
-      placeholder: '请选择国籍',
+      placeholder: '请选择出生国家（地区）',
       onChange: 'onPickerSelect',
       onChange: 'onPickerSelect',
     },
     },
     taxpayerTypeData: {
     taxpayerTypeData: {
@@ -1336,20 +1336,20 @@ Page({
       data: {
       data: {
         'certification_status': that.getCertifyStatus(formdata),
         'certification_status': that.getCertifyStatus(formdata),
         "name": that.data.name,
         "name": that.data.name,
-        "other_name": that.data.other_name,
+        "other_name": that.data.hasOtherCard ? that.data.other_name : '',
         "family_ties": '本人',//that.data.relativeData.selected,
         "family_ties": '本人',//that.data.relativeData.selected,
         "native": that.data.countryData.selected,
         "native": that.data.countryData.selected,
         "taxpayer_type": that.data.taxpayerTypeData.selected == '居民' ? 'resident' :'non-resident',
         "taxpayer_type": that.data.taxpayerTypeData.selected == '居民' ? 'resident' :'non-resident',
         "is_overseas_personnel": that.data.overseas,
         "is_overseas_personnel": that.data.overseas,
-        'birth_native': that.data.birthCountryData.selected,
+        'birth_native': that.data.hasOtherCard ? that.data.birthCountryData.selected : '',
         "id_card_type": that.data.cardtypeData.selected, //selected_code,
         "id_card_type": that.data.cardtypeData.selected, //selected_code,
         "id_card_no": that.data.card_number,
         "id_card_no": that.data.card_number,
-        "other_id_card_type": that.data.otherCardtypeData.selected, //selected_code,
-        "other_id_card_no": formdata.other_card_number,
+        "other_id_card_type": that.data.hasOtherCard ?  that.data.otherCardtypeData.selected : '', //selected_code,
+        "other_id_card_no": that.data.hasOtherCard ? formdata.other_card_number : '',
         "gender": that.data.genderData.selected,
         "gender": that.data.genderData.selected,
         "birth_date": that.data.long_birth_date,
         "birth_date": that.data.long_birth_date,
-        "first_entry_date": that.data.firstEntryDate.datelong,
-        "predict_leave_date": that.data.predictLeaveDate.datelong,
+        "first_entry_date": that.data.hasOtherCard ? that.data.firstEntryDate.datelong : null,
+        "predict_leave_date": that.data.hasOtherCard ? that.data.predictLeaveDate.datelong : null,
         "mobile": that.data.mobile,
         "mobile": that.data.mobile,
         "current_address": request_current_address,
         "current_address": request_current_address,
         "current_address_detail": formdata.current_address_detail,
         "current_address_detail": formdata.current_address_detail,