Merge branch 'master' into feature/dev_party_mange

src/utils/validate.js

@@ -2,38 +2,40 @@
  * 邮箱
  * @param {*} s
  */
-export function isEmail (s) {
+export function isEmail(s) {
-  return /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/.test(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) {
+export function isMobile(s) {
-  return /^1[0-9]{10}$/.test(s)
+  return /^1[0-9]{10}$/.test(s);
 }
 
 /**
  * 电话号码
  * @param {*} s
  */
-export function isPhone (s) {
+export function isPhone(s) {
-  return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s)
+  return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s);
 }
 
 /**
  * URL地址
  * @param {*} s
  */
-export function isURL (s) {
+export function isURL(s) {
-  return /^http[s]?:\/\/.*/.test(s)
+  return /^http[s]?:\/\/.*/.test(s) || /^\/\/.*/.test(s);
 }
 
 /**
  * 身份证
  * @param {*} s
  */
-export function isCard (s) {
+export function isCard(s) {
-  return /^(\d{15}$)|(^\d{17}([0-9]|X)$)/.test(s)
+  return /^(\d{15}$)|(^\d{17}([0-9]|X)$)/.test(s);
 }

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 /^http[s]?:\/\/.*/.test(url);
-      // return isURL(url);
+      return isURL(url);
     },
     // tabs, 选中tab
     tabSelectedHandle(tab) {