From 304e3b8bae0915e55ba2ad7dee455c72e9db9a4b Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 14 Jun 2022 17:42:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/validate.js | 22 ++++++++++++---------- src/views/main-shuju/main-content.vue | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/utils/validate.js b/src/utils/validate.js index 0215c8c4..a130010f 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -2,38 +2,40 @@ * 邮箱 * @param {*} s */ -export function isEmail (s) { - return /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/.test(s) +export function isEmail(s) { + return /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/.test( + s + ); } /** * 手机号码 * @param {*} s */ -export function isMobile (s) { - return /^1[0-9]{10}$/.test(s) +export function isMobile(s) { + return /^1[0-9]{10}$/.test(s); } /** * 电话号码 * @param {*} s */ -export function isPhone (s) { - return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s) +export function isPhone(s) { + return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s); } /** * URL地址 * @param {*} s */ -export function isURL (s) { - return /^http[s]?:\/\/.*/.test(s) +export function isURL(s) { + return /^http[s]?:\/\/.*/.test(s) || /^\/\/.*/.test(s); } /** * 身份证 * @param {*} s */ -export function isCard (s) { - return /^(\d{15}$)|(^\d{17}([0-9]|X)$)/.test(s) +export function isCard(s) { + return /^(\d{15}$)|(^\d{17}([0-9]|X)$)/.test(s); } diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue index 360e96f3..4d6a73a3 100644 --- a/src/views/main-shuju/main-content.vue +++ b/src/views/main-shuju/main-content.vue @@ -61,8 +61,8 @@ export default { // "&customerId=" + // localStorage.getItem("customerId"); - return /^http[s]?:\/\/.*/.test(url) || /^\/\/.*/.test(url); - // return isURL(url); + // return /^http[s]?:\/\/.*/.test(url); + return isURL(url); }, // tabs, 选中tab tabSelectedHandle(tab) {