Merge branch 'dev_py' into dev2.0

pangy
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
pages/main/taxperson/editinfo/editinfo.js
utils/util.js
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @3b17561
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @3b17561
@@ -639,6 +639,7 @@ Page({
         if (res.data.items && res.data.items[0]) {
           var hasLoverData = that.data.hasLoverData
           hasLoverData.selected = '是'
+          hasLoverData.disabled = true
           var data = res.data.items[0], setData = { hasLover: true, hasLoverData: hasLoverData}
           if (data.name && data.name.length) {
             setData.spouse_name = data.name
@@ -722,6 +723,7 @@ Page({
         var hasLoverData = this.data.hasLoverData
         hasLoverData.selected = data.has_spouse == 'y' ? '是' : '否'
+        hasLoverData.disabled = data.has_spouse == 'y' ? true : false
         setData.hasLover = data.has_spouse == 'y' ? true : false
         setData.hasLoverData = hasLoverData
         if (data.spouse_name && data.spouse_name.length) {
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @3b17561
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @3b17561
@@ -340,7 +340,7 @@
     <view class='divide_line_30'></view>
     <view style='height:90rpx'>
       <text class='text_777_30 float_left head_in'>配偶姓名</text>
-      <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}'></input>
+      <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}' disabled='{{hasLover}}'></input>
     </view>
     <view class='divide_line_30'></view>
     <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />
@@ -349,7 +349,7 @@
       <text class='text_777_30 float_left head_in'>配偶证照号码</text>
       <view wx:if="{{isIdCard}}">
         <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="spouse_id_card_no"></image>
-        <input class='input_wrap' style='color:#000;' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}' bindinput="idChange" id='spouse_id_card_no_input'></input>
+        <input class='input_wrap' style='color:#000;' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}' bindinput="idChange" id='spouse_id_card_no_input' disabled='{{hasLover}}'></input>
       </view>
     </view>
     <view class='divide_line_30'></view>
--- a/pages/main/taxperson/editinfo/editinfo.js
查看文件 @3b17561
+++ b/pages/main/taxperson/editinfo/editinfo.js
查看文件 @3b17561
@@ -887,10 +887,14 @@ Page({
       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
+    // }
+    // if (formdata.email && formdata.email.length > 0 && !format.checkEmail(formdata.email)) {
+    //   this.showtoast('邮箱格式有误');
+    //   return
+    // }
     if (formdata.bank_account && formdata.bank_account.length > 0 && !format.banknoCheck(formdata.bank_account)) {
       wx.showToast({
         title: '银行卡号格式有误',
@@ -1016,11 +1020,10 @@ Page({
           // ({
           //   url: '../home/home',
           // })
-        } else {
-          wx.showModal({
-            title: res.data.message,
-            content: '',
-          })
+        } else if (res.data.code == 400){
+          if (res.data.errors.email){
+            that.showtoast('邮箱格式有误')
+          }
         }
       },
       fail(res) {
--- a/utils/util.js
查看文件 @3b17561
+++ b/utils/util.js
查看文件 @3b17561
@@ -224,6 +224,13 @@ function banknoCheck(bankno) {
   }
 }
+function checkEmail(email){
+  // var regEmail = /^(((([a-zA-Z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])+(\\.([a-zA-Z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])+)*)|((\\x22)((((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(([\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]|\\x21|[\\x23-\\x5b]|[\\x5d-\\x7e]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])|(\\([\\x01-\\x09\\x0b\\x0c\\x0d-\\x7f]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}]))))*(((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(\\x22)))@((([a-zA-Z]|\\d|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])|(([a-zA-Z]|\\d|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])([a-zA-Z]|\\d|-|\\.|_|~|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])*([a-zA-Z]|\\d|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])))\\.)+(([a-zA-Z]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])|(([a-zA-Z]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])([a-zA-Z]|\\d|-|\\.|_|~|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])*([a-zA-Z]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])))\\.?$/;
+
+  // var regEmail = new RegExp("^[-a-z0-9~!$%^&;*_=+}{/'?]+(/.[-a-z0-9~!$ %^&;*_=+}{/'?]+)*@([a-z0-9_][-a-z0-9_]*(/.[-a-z0-9_]+)* /.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}/.[0-9]{1,3}/.[0-9]{1,3}/.[0-9]{1,3}))(:[0-9]{1,5})?$");
+  // return regEmail.test(email);
+}
+
 module.exports = {
   formatTime: formatTime,
@@ -239,5 +246,6 @@ module.exports = {
   checkNumber: checkNumber,
   isMobile: isMobile,
   getAge: getAge,
-  banknoCheck: banknoCheck
+  banknoCheck: banknoCheck,
+  checkEmail: checkEmail
 }