...
|
...
|
@@ -55,17 +55,17 @@ Page({ |
55
|
55
|
values: ["否", "是"],
|
56
|
56
|
onChange: 'onPickerSelect'
|
57
|
57
|
},
|
58
|
|
- genderData: {
|
59
|
|
- label: '性别',
|
60
|
|
- bindtype: 'gender',
|
61
|
|
- isrequre: true,
|
62
|
|
- // disabled: true,
|
63
|
|
- selected: '',
|
64
|
|
- placeholder: '请选择性别',
|
65
|
|
- // placeholder: '性别',
|
66
|
|
- values: ["男", "女"],
|
67
|
|
- onChange: 'onPickerSelect'
|
68
|
|
- },
|
|
58
|
+ // genderData: {
|
|
59
|
+ // label: '性别',
|
|
60
|
+ // bindtype: 'gender',
|
|
61
|
+ // isrequre: true,
|
|
62
|
+ // // disabled: true,
|
|
63
|
+ // selected: '',
|
|
64
|
+ // placeholder: '请选择性别',
|
|
65
|
+ // // placeholder: '性别',
|
|
66
|
+ // values: ["男", "女"],
|
|
67
|
+ // onChange: 'onPickerSelect'
|
|
68
|
+ // },
|
69
|
69
|
countryData: {
|
70
|
70
|
label: '国籍',
|
71
|
71
|
bindtype: 'country',
|
...
|
...
|
@@ -183,11 +183,11 @@ Page({ |
183
|
183
|
var isDisable = tax_info.certification_status == 'active' && tax_info.id_card_no.length//已通过拍摄身份证认证过,不能修改
|
184
|
184
|
|
185
|
185
|
this.data.relativeData.selected = tax_info.family_ties
|
186
|
|
- this.data.genderData.selected = tax_info.gender
|
|
186
|
+ // this.data.genderData.selected = tax_info.gender
|
187
|
187
|
this.data.countryData.selected = tax_info.native
|
188
|
188
|
if (isDisable){//否的话受证照类型控制
|
189
|
189
|
this.data.birthDate.disabled = true
|
190
|
|
- this.data.genderData.disabled = true
|
|
190
|
+ // this.data.genderData.disabled = true
|
191
|
191
|
}
|
192
|
192
|
this.data.forignerInfo.selected = tax_info.is_overseas_personnel
|
193
|
193
|
if (tax_info.birth_date == -62135596800 || tax_info.birth_date == 0) {
|
...
|
...
|
@@ -204,7 +204,7 @@ Page({ |
204
|
204
|
long_birth_date: tax_info.birth_date,
|
205
|
205
|
birthDate: this.data.birthDate,
|
206
|
206
|
mobile: tax_info.mobile,
|
207
|
|
- genderData: this.data.genderData,
|
|
207
|
+ // genderData: this.data.genderData,
|
208
|
208
|
isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
|
209
|
209
|
card_number: tax_info.id_card_no,
|
210
|
210
|
countryData: this.data.countryData,
|
...
|
...
|
@@ -245,7 +245,7 @@ Page({ |
245
|
245
|
var cardtype_Data = that.data.cardtypeData
|
246
|
246
|
cardtype_Data.selected = '居民身份证'
|
247
|
247
|
// cardtypeData.selected_code = '1'
|
248
|
|
- var gender_Data = that.data.genderData
|
|
248
|
+ // var gender_Data = that.data.genderData
|
249
|
249
|
gender_Data.selected = id_info.gender
|
250
|
250
|
|
251
|
251
|
that.data.birthDate.selected = birth_day
|
...
|
...
|
@@ -263,7 +263,7 @@ Page({ |
263
|
263
|
name: id_info.name,
|
264
|
264
|
birthday: birth_day,
|
265
|
265
|
cardtypeData: cardtype_Data,
|
266
|
|
- genderData: gender_Data,
|
|
266
|
+ // genderData: gender_Data,
|
267
|
267
|
long_birth_date: Date.parse(new Date(birth_day)) / 1000,
|
268
|
268
|
birthDate: that.data.birthDate,
|
269
|
269
|
card_number: id_info.id_card_number
|
...
|
...
|
@@ -286,11 +286,11 @@ Page({ |
286
|
286
|
|
287
|
287
|
if ('居民身份证' == new_type) {
|
288
|
288
|
is_idcard = true
|
289
|
|
- this.data.genderData.disabled = true
|
|
289
|
+ // this.data.genderData.disabled = true
|
290
|
290
|
this.data.birthDate.disabled = true
|
291
|
291
|
} else {
|
292
|
292
|
is_idcard = false
|
293
|
|
- this.data.genderData.disabled = false
|
|
293
|
+ // this.data.genderData.disabled = false
|
294
|
294
|
this.data.birthDate.disabled = false
|
295
|
295
|
}
|
296
|
296
|
this.data.forignerInfo.selected = '是'
|
...
|
...
|
@@ -313,7 +313,7 @@ Page({ |
313
|
313
|
this.setData({
|
314
|
314
|
isIdCard: is_idcard,
|
315
|
315
|
birthDate: this.data.birthDate,
|
316
|
|
- genderData: this.data.genderData,
|
|
316
|
+ // genderData: this.data.genderData,
|
317
|
317
|
countryData: this.data.countryData,
|
318
|
318
|
cardtypeData: this.data.cardtypeData,
|
319
|
319
|
forignerInfo: this.data.forignerInfo
|
...
|
...
|
@@ -353,13 +353,13 @@ Page({ |
353
|
353
|
})
|
354
|
354
|
}
|
355
|
355
|
break;
|
356
|
|
- case 'gender':
|
357
|
|
- var gender_data = this.data.genderData
|
358
|
|
- gender_data.selected = gender_data.values[e.detail.value]
|
359
|
|
- this.setData({
|
360
|
|
- genderData: gender_data
|
361
|
|
- })
|
362
|
|
- break;
|
|
356
|
+ // case 'gender':
|
|
357
|
+ // var gender_data = this.data.genderData
|
|
358
|
+ // gender_data.selected = gender_data.values[e.detail.value]
|
|
359
|
+ // this.setData({
|
|
360
|
+ // genderData: gender_data
|
|
361
|
+ // })
|
|
362
|
+ // break;
|
363
|
363
|
case 'country':
|
364
|
364
|
var countryData = this.data.countryData
|
365
|
365
|
var new_country = countryData.values[e.detail.value]
|
...
|
...
|
@@ -430,26 +430,26 @@ Page({ |
430
|
430
|
// this.showtoast('请输入正确姓名');
|
431
|
431
|
// return
|
432
|
432
|
}
|
433
|
|
- if (this.data.genderData.selected.length < 1) {
|
434
|
|
- this.showtoast('请选择性别');
|
435
|
|
- return
|
436
|
|
- }else {
|
437
|
|
- if (this.data.genderData.selected == '男') {
|
438
|
|
- if (rel == '女') {
|
439
|
|
- this.showtoast('关系和性别冲突');
|
440
|
|
- return
|
441
|
|
- }
|
442
|
|
- } else {
|
443
|
|
- if (rel == '子') {
|
444
|
|
- this.showtoast('关系和性别冲突');
|
445
|
|
- return
|
446
|
|
- }
|
447
|
|
- }
|
448
|
|
- if (rel == '配偶' && this.data.genderData.selected == app.globalData.hostInfo.gender) {
|
449
|
|
- this.showtoast('关系和性别冲突');
|
450
|
|
- return
|
451
|
|
- }
|
452
|
|
- }
|
|
433
|
+ // if (this.data.genderData.selected.length < 1) {
|
|
434
|
+ // this.showtoast('请选择性别');
|
|
435
|
+ // return
|
|
436
|
+ // }else {
|
|
437
|
+ // if (this.data.genderData.selected == '男') {
|
|
438
|
+ // if (rel == '女') {
|
|
439
|
+ // this.showtoast('关系和性别冲突');
|
|
440
|
+ // return
|
|
441
|
+ // }
|
|
442
|
+ // } else {
|
|
443
|
+ // if (rel == '子') {
|
|
444
|
+ // this.showtoast('关系和性别冲突');
|
|
445
|
+ // return
|
|
446
|
+ // }
|
|
447
|
+ // }
|
|
448
|
+ // if (rel == '配偶' && this.data.genderData.selected == app.globalData.hostInfo.gender) {
|
|
449
|
+ // this.showtoast('关系和性别冲突');
|
|
450
|
+ // return
|
|
451
|
+ // }
|
|
452
|
+ // }
|
453
|
453
|
// if (!formdata.age) {
|
454
|
454
|
// this.showtoast('请填写年龄');
|
455
|
455
|
// return
|
...
|
...
|
@@ -501,7 +501,7 @@ Page({ |
501
|
501
|
"id_card_type": that.data.cardtypeData.selected,//_code,
|
502
|
502
|
"id_card_no": that.data.card_number,
|
503
|
503
|
"name": name,
|
504
|
|
- "gender": that.data.genderData.selected,
|
|
504
|
+ // "gender": that.data.genderData.selected,
|
505
|
505
|
"mobile": formdata.mobile,
|
506
|
506
|
// "age": formdata.age ? formdata.age : '',
|
507
|
507
|
"birth_date": that.data.long_birth_date,
|
...
|
...
|
@@ -536,9 +536,9 @@ Page({ |
536
|
536
|
var name = this.data.name.length > 0 ? this.data.name : formdata.name;
|
537
|
537
|
var cardtype = this.data.cardtypeData.selected;
|
538
|
538
|
var card_no = formdata.id_card_no ? formdata.id_card_no : this.data.card_number;
|
539
|
|
- var gender = this.data.genderData.selected;
|
|
539
|
+ // var gender = this.data.genderData.selected;
|
540
|
540
|
var birth_day = this.data.birthDate.selected;
|
541
|
|
- if (name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && gender == iddata.gender && birth_day == this.data.birthday) {
|
|
541
|
+ if (name == iddata.name && cardtype == '居民身份证' && card_no == iddata.id_card_number && birth_day == this.data.birthday) {//&& gender == iddata.gender
|
542
|
542
|
return 'active'
|
543
|
543
|
} else {
|
544
|
544
|
return ''
|
...
|
...
|
@@ -565,13 +565,13 @@ Page({ |
565
|
565
|
birthDate: this.data.birthDate
|
566
|
566
|
})
|
567
|
567
|
}
|
568
|
|
- if (info.sex) {
|
569
|
|
- var gender_data = this.data.genderData
|
570
|
|
- gender_data.selected = info.sex
|
571
|
|
- this.setData({
|
572
|
|
- genderData: gender_data
|
573
|
|
- })
|
574
|
|
- }
|
|
568
|
+ // if (info.sex) {
|
|
569
|
+ // var gender_data = this.data.genderData
|
|
570
|
+ // gender_data.selected = info.sex
|
|
571
|
+ // this.setData({
|
|
572
|
+ // genderData: gender_data
|
|
573
|
+ // })
|
|
574
|
+ // }
|
575
|
575
|
},
|
576
|
576
|
|
577
|
577
|
idChange: function (e) {
|
...
|
...
|
|