From 358b9a55926bcdc86ecabbcf8edf33f5de7a29fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com> Date: Sat, 13 Jun 2020 18:30:28 +0800 Subject: [PATCH] 1 --- src/utils/Common.js | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/src/utils/Common.js b/src/utils/Common.js index 17bb576..34bb770 100644 --- a/src/utils/Common.js +++ b/src/utils/Common.js @@ -5,7 +5,7 @@ * @company kiisoo */ -import roter from '../router' +import roter from "../router"; // import store from '../store' /** @@ -15,38 +15,29 @@ import roter from '../router' */ export function goToLogin() { // store.commit("LOGOUT"); - roter.push('/login') + roter.push("/login"); } export function formatDate(dt) { - dt = new Date(dt) - let year = dt.getFullYear() - let month = dt.getMonth() + 1 - let day = dt.getDate() - month = month < 10 ? '0' + month : month - day = day < 10 ? '0' + day : day - return year + '-' + month + '-' + day + dt = new Date(dt); + let year = dt.getFullYear(); + let month = dt.getMonth() + 1; + let day = dt.getDate(); + month = month < 10 ? "0" + month : month; + day = day < 10 ? "0" + day : day; + return year + "-" + month + "-" + day; } export function isURL(str_url) { // 验证url - var strRegex = - '^((https|http)?://)' + - "?(([0-9a-z_!~*'().&=+$%-]+: )?[0-9a-z_!~*'().&=+$%-]+@)?" + // ftp的user@ - '(([0-9]{1,3}.){3}[0-9]{1,3}' + // IP形式的URL- 199.194.52.184 - '|' + // 允许IP和DOMAIN(域名) - "([0-9a-z_!~*'()-]+.)*" + // 域名- www. - '([0-9a-z][0-9a-z-]{0,61})?[0-9a-z].' + // 二级域名 - '[a-z]{2,6})' + // first level domain- .com or .museum - '(:[0-9]{1,4})?' + // 端口- :80 - '((/?)|' + // a slash isn't required if there is no file name - "(/[0-9a-z_!~*'().;?:@&=+$,%#-]+)+/?)$" - var re = new RegExp(strRegex) - return re.test(str_url) + var strRegex = /(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/; + var re = new RegExp(strRegex); + console.log(re.test(str_url)); + return re.test(str_url); } export default { goToLogin, formatDate, isURL, -} +};