|
@@ -447,7 +447,7 @@ Page({ |
|
@@ -447,7 +447,7 @@ Page({ |
|
447
|
var Authorization = app.globalData.Authorization;
|
447
|
var Authorization = app.globalData.Authorization;
|
|
448
|
var bank_info = that.data.bankInfo
|
448
|
var bank_info = that.data.bankInfo
|
|
449
|
wx.request({
|
449
|
wx.request({
|
|
450
|
- url: baseUrl + 'walletmgm/v1/bankinfos',
|
450
|
+ url: baseUrl + 'persontax/v1/bank-list',
|
|
451
|
method: "GET",
|
451
|
method: "GET",
|
|
452
|
header: {
|
452
|
header: {
|
|
453
|
'content-type': 'application/json', // 默认值
|
453
|
'content-type': 'application/json', // 默认值
|
|
@@ -455,7 +455,7 @@ Page({ |
|
@@ -455,7 +455,7 @@ Page({ |
|
455
|
},
|
455
|
},
|
|
456
|
success: function(res) {
|
456
|
success: function(res) {
|
|
457
|
console.log(res)
|
457
|
console.log(res)
|
|
458
|
- bank_info.values = that.handleBankinfo(res.data.items)
|
458
|
+ bank_info.values = res.data.banks//that.handleBankinfo(res.data.items)
|
|
459
|
|
459
|
|
|
460
|
that.setData({
|
460
|
that.setData({
|
|
461
|
banklist: res.data.items,
|
461
|
banklist: res.data.items,
|
|
@@ -869,14 +869,17 @@ Page({ |
|
@@ -869,14 +869,17 @@ Page({ |
|
869
|
// this.showtoast('有必填项未填写');
|
869
|
// this.showtoast('有必填项未填写');
|
|
870
|
// return
|
870
|
// return
|
|
871
|
// } else
|
871
|
// } else
|
|
872
|
- if (this.data.mobile.length > 0 && !regMobile.test(this.data.mobile)) {
|
872
|
+ if (this.data.mobile.length < 1) {
|
|
|
|
873
|
+ this.showtoast('请输入手机号码');
|
|
|
|
874
|
+ return
|
|
|
|
875
|
+ } else if (this.data.mobile.length > 0 && !regMobile.test(this.data.mobile)) {
|
|
873
|
this.showtoast('手机号码有误');
|
876
|
this.showtoast('手机号码有误');
|
|
874
|
return
|
877
|
return
|
|
875
|
}
|
878
|
}
|
|
876
|
- if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
|
|
|
|
877
|
- this.showtoast('请输入正确邮箱');
|
|
|
|
878
|
- return
|
|
|
|
879
|
- }
|
879
|
+ // if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
|
|
|
|
880
|
+ // this.showtoast('请输入正确邮箱');
|
|
|
|
881
|
+ // return
|
|
|
|
882
|
+ // }
|
|
880
|
//else if (this.data.investInfo.selected.length < 1) {
|
883
|
//else if (this.data.investInfo.selected.length < 1) {
|
|
881
|
// this.showtoast('有必填项未填写');
|
884
|
// this.showtoast('有必填项未填写');
|
|
882
|
// return
|
885
|
// return
|
|
@@ -936,23 +939,23 @@ Page({ |
|
@@ -936,23 +939,23 @@ Page({ |
|
936
|
|
939
|
|
|
937
|
"mobile": that.data.mobile,
|
940
|
"mobile": that.data.mobile,
|
|
938
|
"current_address": request_current_address,
|
941
|
"current_address": request_current_address,
|
|
939
|
- "current_address_detail": formdata.current_address_detail ? formdata.current_address_detail : that.data.taxInfo.current_address_detail,
|
942
|
+ "current_address_detail": formdata.current_address_detail,
|
|
940
|
"huji_address": request_birth_address,
|
943
|
"huji_address": request_birth_address,
|
|
941
|
- "huji_address_detail": formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, "").length > 0 ? formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, "") : that.data.huji_address_detail,
|
|
|
|
942
|
- "email": formdata.email.length > 0 ? formdata.email : that.data.taxInfo.email,
|
944
|
+ "huji_address_detail": formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
|
|
|
|
945
|
+ "email": formdata.email,
|
|
943
|
|
946
|
|
|
944
|
"profession": request_profession,
|
947
|
"profession": request_profession,
|
|
945
|
"education": that.data.degreeData.selected,
|
948
|
"education": that.data.degreeData.selected,
|
|
946
|
"bank": that.data.bankInfo.selected,
|
949
|
"bank": that.data.bankInfo.selected,
|
|
947
|
- "bank_account": formdata.bank_account.length > 0 ? formdata.bank_account : that.data.taxInfo.bank_account,
|
950
|
+ "bank_account": formdata.bank_account,
|
|
948
|
// "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : that.data.taxInfo.taxpayer_no,
|
951
|
// "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : that.data.taxInfo.taxpayer_no,
|
|
949
|
// "taxpayer_status": that.data.personstatusData.selected,
|
952
|
// "taxpayer_status": that.data.personstatusData.selected,
|
|
950
|
"is_disability": that.data.disabilityInfo.selected,
|
953
|
"is_disability": that.data.disabilityInfo.selected,
|
|
951
|
- "disability_no": that.data.disabilityInfo.selected == '否' ? '' : (formdata.disability_no.length > 0 ? formdata.disability_no : that.data.taxInfo.disability_no),
|
954
|
+ "disability_no": that.data.disabilityInfo.selected == '否' ? '' : formdata.disability_no,
|
|
952
|
"is_martyr_family": that.data.lieshuInfo.selected,
|
955
|
"is_martyr_family": that.data.lieshuInfo.selected,
|
|
953
|
- "martyr_family_no": that.data.lieshuInfo.selected == '否' ? '' : (formdata.martyr_family_no.length > 0 ? formdata.martyr_family_no : that.data.taxInfo.martyr_family_no),
|
956
|
+ "martyr_family_no": that.data.lieshuInfo.selected == '否' ? '' : formdata.martyr_family_no,
|
|
954
|
"is_lonely_man": that.data.lonelyolderInfo.selected,
|
957
|
"is_lonely_man": that.data.lonelyolderInfo.selected,
|
|
955
|
- "comment": formdata.comment.length > 0 ? formdata.comment : that.data.taxInfo.comment,
|
958
|
+ "comment": formdata.comment,
|
|
956
|
|
959
|
|
|
957
|
// "contact_address": request_contact_address ? request_contact_address : that.data.taxInfo.contact_address_detail,
|
960
|
// "contact_address": request_contact_address ? request_contact_address : that.data.taxInfo.contact_address_detail,
|
|
958
|
// "contact_address_detail": formdata.contact_address_detail.length > 0 ? formdata.contact_address_detail : that.data.taxInfo.contact_address_detail,
|
961
|
// "contact_address_detail": formdata.contact_address_detail.length > 0 ? formdata.contact_address_detail : that.data.taxInfo.contact_address_detail,
|
