fix: 修复店铺询盘的手机号码校验问题

xinkeaboard-web/composables/common.js

@@ -191,6 +191,20 @@ export function checkEmail(email) {
 }
 
 /*
+* 邮箱的验证 非必填只校验格式
+* 验证通过，返回boolean值true，否则返回具体的错误信息
+* @zjf-2021-01-.gitignore
+* */
+export function existCheckEmail(email) {
+  let tarLang = getCurLanguage();
+  let reg = /^([a-zA-Z0-9_-]+[-_.]?)*[a-zA-Z0-9_-]+@([a-zA-Z0-9.-]+[-_.]?)*[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$/;
+  if (email && !reg.test(email)) {
+      return tarLang['请输入正确的邮箱'];
+  }
+  return true;
+}
+
+/*
 * 短信图形验证码的验证：4位英文字母和数字
 * 验证通过，返回boolean值true，否则返回具体的错误信息
 * @zjf-2021-01-07
@@ -225,6 +239,14 @@ export function checkEmailCode(val) {
   }
 }
 
+export function existCheckPhone(mobile, txt) {
+  let tarLang = getCurLanguage();
+  let regMobile = /(1[3-9]\d{9}$)/;
+  if (mobile && !regMobile.test(mobile)) {
+      return txt ? txt : tarLang['请输入正确的手机号'];
+  }
+  return true;
+}
 
 
 export function checkPhone(mobile, txt) {

xinkeaboard-web/pages/home/contact.vue

@@ -244,6 +244,13 @@ const checkEmailFun = (rule, value, callback) => {
   callback();
 };
 
+const existCheckEmailFun = (rule, value, callback) => {
+  if (existCheckEmail(value) !== true) {
+    callback(new Error(existCheckEmail(value)));
+  }
+  callback();
+};
+
 const checkPhoneFun = (rule, value, callback) => {
   if (checkPhone(value) !== true) {
     callback(new Error(checkPhone(value)));
@@ -251,6 +258,13 @@ const checkPhoneFun = (rule, value, callback) => {
   callback();
 };
 
+const existCheckPhoneFun = (rule, value, callback) => {
+  if (existCheckPhone(value) !== true) {
+    callback(new Error(existCheckPhone(value)));
+  }
+  callback();
+};
+
 const closeModal = (formEl) => {
   if (!formEl) return;
   formEl.resetFields();
@@ -262,7 +276,9 @@ const rules = reactive({
   email: contactType === "email" ? [
      { required: true, message: L["请输入邮箱"], trigger: "blur" },
      { validator: checkEmailFun, trigger: "blur" },
-  ] : [],
+  ] : [
+    { validator: existCheckEmailFun, trigger: "blur" }
+  ],
   phoneCode: [
     {
       required: true,
@@ -273,7 +289,11 @@ const rules = reactive({
   phone: contactType === "mobile" ? [
     { required: true, message: L["请输入电话"], trigger: "blur" },
     { validator: checkPhoneFun, trigger: "blur" },
-  ] : [],
+  ] : [
+    {
+      validator: existCheckPhoneFun, trigger: "blur"
+    }
+  ],
   company: [
     {
       required: true,