Merge branch 'dev_py' into dev2.0

@@ -252,13 +252,7 @@ Page({
     var formdata = e.detail.value;
     var formdata = e.detail.value;
     console.log("formdata", formdata);
     console.log("formdata", formdata);
     console.log('idnum', this.data.card_number.length < 1 && !format.isIDCardNum(formdata.id_card_no))
     console.log('idnum', this.data.card_number.length < 1 && !format.isIDCardNum(formdata.id_card_no))
-    if (formdata.name.length < 1) {
-      this.showtoast('姓名未填写');
-      return
-    } else if (!regname.test(formdata.name)) {
-      this.showtoast('请输入正确姓名');
-      return
-    } else if (this.data.relativeData.selected.length < 1) {
+    if (this.data.relativeData.selected.length < 1) {
       this.showtoast('请选择关系');
       this.showtoast('请选择关系');
       return
       return
     }
     }
@@ -272,8 +266,11 @@ Page({
       this.showtoast('请填写证照号码');
       this.showtoast('请填写证照号码');
       return
       return
     } 
     } 
-    else if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
-      this.showtoast('请输入正确邮箱');
+    if (formdata.name.length < 1) {
+      this.showtoast('姓名未填写');
+      return
+    } else if (!regname.test(formdata.name)) {
+      this.showtoast('请输入正确姓名');
       return
       return
     }
     }
     var new_card_num = ''
     var new_card_num = ''