Merge branch 'dev2.0' of http://192.144.137.25:8888/wangyu/naturalPersonTax into dev2.0

wangyu
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/taxperson/editinfo/editinfo.js
pages/main/taxperson/editinfo/editinfo.wxml
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @7924495
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @7924495
@@ -1008,7 +1008,7 @@ Page({
     var bank_info = that.data.bankInfo
     var bank_info_2 = that.data.bankInfo_2
     wx.request({
-      url: baseUrl + 'walletmgm/v1/bankinfos',
+      url: baseUrl + 'persontax/v1/bank-list',
       method: "GET",
       header: {
         'content-type': 'application/json', // 默认值
@@ -1016,8 +1016,8 @@ Page({
       },
       success: function(res) {
         console.log(res)
-        bank_info.values = that.handleBankinfo(res.data.items)
-        bank_info_2.values = that.handleBankinfo(res.data.items)
+        bank_info.values = res.data.banks//that.handleBankinfo(res.data.items)
+        bank_info_2.values = res.data.banks//that.handleBankinfo(res.data.items)
         that.setData({
           bankInfo: bank_info,
           bankInfo_2: bank_info_2
--- a/pages/main/taxperson/editinfo/editinfo.js
查看文件 @7924495
+++ b/pages/main/taxperson/editinfo/editinfo.js
查看文件 @7924495
@@ -447,7 +447,7 @@ Page({
     var Authorization = app.globalData.Authorization;
     var bank_info = that.data.bankInfo
     wx.request({
-      url: baseUrl + 'walletmgm/v1/bankinfos',
+      url: baseUrl + 'persontax/v1/bank-list',
       method: "GET",
       header: {
         'content-type': 'application/json', // 默认值
@@ -455,7 +455,7 @@ Page({
       },
       success: function(res) {
         console.log(res)
-        bank_info.values = that.handleBankinfo(res.data.items)
+        bank_info.values = res.data.banks//that.handleBankinfo(res.data.items)
         that.setData({
           banklist: res.data.items,
@@ -869,14 +869,17 @@ Page({
     //   this.showtoast('有必填项未填写');
     //   return
     // } else 
-    if (this.data.mobile.length > 0 && !regMobile.test(this.data.mobile)) {
+    if (this.data.mobile.length < 1) {
+      this.showtoast('请输入手机号码');
+      return
+    } else if (this.data.mobile.length > 0 && !regMobile.test(this.data.mobile)) {
       this.showtoast('手机号码有误');
       return
     } 
-    if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
-      this.showtoast('请输入正确邮箱');
-      return
-    }
+    // if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
+    //   this.showtoast('请输入正确邮箱');
+    //   return
+    // }
     //else if (this.data.investInfo.selected.length < 1) {
     //   this.showtoast('有必填项未填写');
     //   return
@@ -936,23 +939,23 @@ Page({
         "mobile": that.data.mobile,
         "current_address": request_current_address,
-        "current_address_detail": formdata.current_address_detail ? formdata.current_address_detail : that.data.taxInfo.current_address_detail,
+        "current_address_detail": formdata.current_address_detail,
         "huji_address": request_birth_address,
-        "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,
-        "email": formdata.email.length > 0 ? formdata.email : that.data.taxInfo.email,
+        "huji_address_detail": formdata.huji_address_detail.replace(/(^\s*)|(\s*$)/g, ""),
+        "email": formdata.email,
         "profession": request_profession,
         "education": that.data.degreeData.selected,
         "bank": that.data.bankInfo.selected,
-        "bank_account": formdata.bank_account.length > 0 ? formdata.bank_account : that.data.taxInfo.bank_account,
+        "bank_account": formdata.bank_account,
         // "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : that.data.taxInfo.taxpayer_no,
         // "taxpayer_status": that.data.personstatusData.selected,
         "is_disability": that.data.disabilityInfo.selected,
-        "disability_no": that.data.disabilityInfo.selected == '否' ? '' : (formdata.disability_no.length > 0 ? formdata.disability_no : that.data.taxInfo.disability_no),
+        "disability_no": that.data.disabilityInfo.selected == '否' ? '' : formdata.disability_no,
         "is_martyr_family": that.data.lieshuInfo.selected,
-        "martyr_family_no": that.data.lieshuInfo.selected == '否' ? '' : (formdata.martyr_family_no.length > 0 ? formdata.martyr_family_no : that.data.taxInfo.martyr_family_no),
+        "martyr_family_no": that.data.lieshuInfo.selected == '否' ? '' : formdata.martyr_family_no,
         "is_lonely_man": that.data.lonelyolderInfo.selected,
-        "comment": formdata.comment.length > 0 ? formdata.comment : that.data.taxInfo.comment,
+        "comment": formdata.comment,
         // "contact_address": request_contact_address ? request_contact_address : that.data.taxInfo.contact_address_detail,
         // "contact_address_detail": formdata.contact_address_detail.length > 0 ? formdata.contact_address_detail : that.data.taxInfo.contact_address_detail,
--- a/pages/main/taxperson/editinfo/editinfo.wxml
查看文件 @7924495
+++ b/pages/main/taxperson/editinfo/editinfo.wxml
查看文件 @7924495
@@ -141,8 +141,8 @@
       <view class='data_item'>
         <view hidden='{{!isshow03}}'> 
           <template is="picker_cell_normal" data="{{...degreeData}}" />
-          <view class="divide_line_30"></view>
-          <template is="picker_cell_normal" data="{{...professionData}}" />
+          <!-- <view class="divide_line_30"></view>
+          <template is="picker_cell_normal" data="{{...professionData}}" /> -->
           <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...bankInfo}}" />
           <view class="divide_line_30"></view>