Merge branch 'sit' into dev

src/utils/validate.js

@@ -7,85 +7,84 @@
  * @returns {Boolean}
  */
 export function isExternal(path) {
-  return /^(https?:|mailto:|tel:)/.test(path)
+  return /^(https?:|mailto:|tel:)/.test(path);
 }
-//区-座-分 
+//区-座-分
 export function isqzf(s) {
-  let type = true
-  let arr = s.split('-')
+  let type = true;
+  let arr = s.split("-");
   if (arr.length === 3) {
-    type = setqj(arr[0]) && setzj(arr[1]) && setfj(arr[2])
+    type = setqj(arr[0]) && setzj(arr[1]) && setfj(arr[2]);
   } else {
-    type = false
+    type = false;
   }
-  console.log('console区-座-分 ' + type);
-  return type
+  console.log("console区-座-分 " + type);
+  return type;
 }
-// //区-座 
+// //区-座
 export function isqz(s) {
-  let type = true
-  let arr = s.split('-')
+  let type = true;
+  let arr = s.split("-");
   if (arr.length === 2) {
-    type = setqj(arr[0]) && setzj(arr[1])
+    type = setqj(arr[0]) && setzj(arr[1]);
   } else {
-    type = false
+    type = false;
   }
-  console.log('console区-座 ' + type);
-  return type
+  console.log("console区-座 " + type);
+  return type;
 }
-//座-分 
+//座-分
 export function iszf(s) {
-  let type = true
-  let arr = s.split('-')
+  let type = true;
+  let arr = s.split("-");
   if (arr.length === 2) {
-    type = setzj(arr[0]) && setfj(arr[1])
+    type = setzj(arr[0]) && setfj(arr[1]);
   } else {
-    type = false
+    type = false;
   }
-  console.log('console座-分' + type);
-  return type
+  console.log("console座-分" + type);
+  return type;
 }
 
 //座
 export function isz(s) {
-  let type = true
-  let arr = s.split('-')
+  let type = true;
+  let arr = s.split("-");
   if (arr.length === 1) {
-    type = setzj(arr[0])
+    type = setzj(arr[0]);
   } else {
-    type = false
+    type = false;
   }
-  console.log('console座' + type);
-  return type
+  console.log("console座" + type);
+  return type;
 }
 function setqj(s) {
-  return /0\d{2,3}?$/.test(s) && (s.length == 3 || s.length == 4)
+  return /0\d{2,3}?$/.test(s) && (s.length == 3 || s.length == 4);
 }
 function setzj(s) {
-  return /\d{7,8}$/.test(s) && (s.length == 7 || s.length == 8)
+  return /\d{7,8}$/.test(s) && (s.length == 7 || s.length == 8);
 }
 function setfj(s) {
-  return /\d{1,6}$/.test(s) && (s.length > 0 && s.length < 7)
+  return /\d{1,6}$/.test(s) && s.length > 0 && s.length < 7;
 }
 
-
 /** 用户名
  * @param {string} str
  * @returns {Boolean}
  */
 export function validUsername(str) {
-  const valid_map = ['admin', 'editor']
-  return valid_map.indexOf(str.trim()) >= 0
+  const valid_map = ["admin", "editor"];
+  return valid_map.indexOf(str.trim()) >= 0;
 }
 
-
 /** url
  * @param {string} url
  * @returns {Boolean}
  */
 export function validURL(url) {
-  const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
-  return reg.test(url)
+  const reg =
+    /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/;
+  return reg.test(url);
 }
 
 /** 小写字母
@@ -93,8 +92,8 @@ export function validURL(url) {
  * @returns {Boolean}
  */
 export function validLowerCase(str) {
-  const reg = /^[a-z]+$/
-  return reg.test(str)
+  const reg = /^[a-z]+$/;
+  return reg.test(str);
 }
 
 /** 大写字母
@@ -102,8 +101,8 @@ export function validLowerCase(str) {
  * @returns {Boolean}
  */
 export function validUpperCase(str) {
-  const reg = /^[A-Z]+$/
-  return reg.test(str)
+  const reg = /^[A-Z]+$/;
+  return reg.test(str);
 }
 
 /** 字母
@@ -111,8 +110,8 @@ export function validUpperCase(str) {
  * @returns {Boolean}
  */
 export function validAlphabets(str) {
-  const reg = /^[A-Za-z]+$/
-  return reg.test(str)
+  const reg = /^[A-Za-z]+$/;
+  return reg.test(str);
 }
 
 /** 邮箱
@@ -120,8 +119,9 @@ export function validAlphabets(str) {
  * @returns {Boolean}
  */
 export function validEmail(email) {
-  const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
-  return reg.test(email)
+  const reg =
+    /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+  return reg.test(email);
 }
 
 /** 字符串
@@ -129,10 +129,10 @@ export function validEmail(email) {
  * @returns {Boolean}
  */
 export function isString(str) {
-  if (typeof str === 'string' || str instanceof String) {
-    return true
+  if (typeof str === "string" || str instanceof String) {
+    return true;
   }
-  return false
+  return false;
 }
 
 /** 数组
@@ -140,10 +140,10 @@ export function isString(str) {
  * @returns {Boolean}
  */
 export function isArray(arg) {
-  if (typeof Array.isArray === 'undefined') {
-    return Object.prototype.toString.call(arg) === '[object Array]'
+  if (typeof Array.isArray === "undefined") {
+    return Object.prototype.toString.call(arg) === "[object Array]";
   }
-  return Array.isArray(arg)
+  return Array.isArray(arg);
 }
 
 /**
@@ -153,7 +153,7 @@ export function isArray(arg) {
 export function isEmail(s) {
   return /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/.test(
     s
-  )
+  );
 }
 
 /**
@@ -161,7 +161,15 @@ export function isEmail(s) {
  * @param {*} s
  */
 export function isMobile(s) {
-  return /^1[3|4|5|6|7|8|9][0-9]\d{8}$/.test(s)
+  return isM(s) || isHK(s);
+}
+// 手机号码
+function isM(s) {
+  return /^1[3|4|5|6|7|8|9][0-9]\d{8}$/.test(s);
+}
+// 香港手机号码
+function isHK(s) {
+  return /^852[5|6|8|9]\d{7}$/.test(s);
 }
 
 /**
@@ -169,23 +177,22 @@ export function isMobile(s) {
  * @param {*} 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);
 }
 
-
 /**
  * 微信号
  * @param {*} s
  */
 export function isWeixin(s) {
-  return /^[a-zA-Z]([-_a-zA-Z0-9]{5,19})+$/.test(s)
+  return /^[a-zA-Z]([-_a-zA-Z0-9]{5,19})+$/.test(s);
 }
 /**
  * qq号
  * @param {*} s
  */
 export function isQQ(s) {
-  return /^[1-9][0-9]{4,14}$/.test(s)
+  return /^[1-9][0-9]{4,14}$/.test(s);
 }
 
 /**
@@ -193,32 +200,39 @@ export function isQQ(s) {
  * @param {*} s
  */
 export function isExtension(s) {
-  let type = true
-  let arr = s.split('-')
+  let type = true;
+  let arr = s.split("-");
   // console.log(arr);
   if (arr.length === 2 || arr.length === 3) {
-    type = setF(arr)
+    type = setF(arr);
   } else {
-    type = false
+    type = false;
   }
   // console.log('console' + type);
-  return type
+  return type;
   ///0\d{2,3}-\d{7,8}(-\d{1,6})?/.test(s)
 }
 function setF(arr) {
-  let type1 = true, type2 = true, type3 = true
-  type1 = /0\d{2,3}?$/.test(arr[0])
-  type2 = arr[1].length === 7 || arr[1].length === 8 ? /\d{7,8}$/.test(arr[1]) : false;
+  let type1 = true,
+    type2 = true,
+    type3 = true;
+  type1 = /0\d{2,3}?$/.test(arr[0]);
+  type2 =
+    arr[1].length === 7 || arr[1].length === 8
+      ? /\d{7,8}$/.test(arr[1])
+      : false;
   if (arr.length === 3) {
-    type3 = arr[2].length === 0 || arr[2].length > 6 ? false : /\d{1,6}$/.test(arr[2])
+    type3 =
+      arr[2].length === 0 || arr[2].length > 6
+        ? false
+        : /\d{1,6}$/.test(arr[2]);
   }
   // console.log(type1, type2, type3);
   if (arr.length === 2) {
-    return type1 && type2
+    return type1 && type2;
   } else {
-    return type1 && type2 && type3
+    return type1 && type2 && type3;
   }
-
 }
 
 // (^(\d{11})$|^((\d{3}-)?\d{8}(-\d{1,4})?)$|^((\d{4}-)?\d{7}(-\d{1,4})?)$|^(\d{7,8})$)
@@ -227,7 +241,7 @@ function setF(arr) {
  * @param {*} s
  */
 export function isLicense(s) {
-  return /[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}/.test(s)
+  return /[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}/.test(s);
 }
 
 /**
@@ -237,7 +251,7 @@ export function isLicense(s) {
 export function isIDentityCard(s) {
   return /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(
     s
-  )
+  );
 }
 
 /**
@@ -245,7 +259,7 @@ export function isIDentityCard(s) {
  * @param {*} s
  */
 export function isURL(s) {
-  return /^http[s]?:\/\/.*/.test(s)
+  return /^http[s]?:\/\/.*/.test(s);
 }
 
 /**
@@ -253,7 +267,7 @@ export function isURL(s) {
  * @param {*} s
  */
 export function isChinese(s) {
-  return /[\u4e00-\u9fa5]$/.test(s)
+  return /[\u4e00-\u9fa5]$/.test(s);
 }
 
 /**
@@ -261,28 +275,28 @@ export function isChinese(s) {
  * @param {*} s
  */
 export function isnumber(s) {
-  return /^[0-9]*$/.test(s)
+  return /^[0-9]*$/.test(s);
 }
 /**
  * 数字或者带小数点的数字
  * @param {*} s
  */
 export function isnumber2(s) {
-  return /(^[0-9]{1,2}$)|(^[0-9]{1,2}[\.]{1}[0-9]{1,2}$)/.test(s)
+  return /(^[0-9]{1,2}$)|(^[0-9]{1,2}[\.]{1}[0-9]{1,2}$)/.test(s);
 }
 /**
  * 数字或者带小数点的数字 1,2,3位小数
  * @param {*} s
  */
 export function isnumber3(s) {
-  return /^(([^0][0-9]+|0)\.([0-9]{1,3})$)|^([^0][0-9]+|0)$/.test(s)
+  return /^(([^0][0-9]+|0)\.([0-9]{1,3})$)|^([^0][0-9]+|0)$/.test(s);
 }
 /**
  * 数字字母
  * @param {*} s
  */
 export function isAlphanumeric(s) {
-  return /^[0-9A-Za-z]*$/.test(s)
+  return /^[0-9A-Za-z]*$/.test(s);
 }
 
 /**
@@ -290,9 +304,10 @@ export function isAlphanumeric(s) {
  * @param {*} s
  */
 export function isEmoticon(s) {
-  const reg = /[^\u0020-\u007E\u00A0-\u00BE\u2E80-\uA4CF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF\u0080-\u009F\u2000-\u201f\u2026\u2022\u20ac\r\n]/g
+  const reg =
+    /[^\u0020-\u007E\u00A0-\u00BE\u2E80-\uA4CF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF\u0080-\u009F\u2000-\u201f\u2026\u2022\u20ac\r\n]/g;
   // console.log(reg.test(s));
-  return reg.test(s)
+  return reg.test(s);
 }
 
 /**
@@ -300,51 +315,47 @@ export function isEmoticon(s) {
  * @param {*} s
  */
 export function JudgeEnvironment() {
-  const ua = navigator.userAgent.toLowerCase()
-  let environment = ''
-  const isWeixin = ua.indexOf('micromessenger') != -1
+  const ua = navigator.userAgent.toLowerCase();
+  let environment = "";
+  const isWeixin = ua.indexOf("micromessenger") != -1;
   if (isWeixin) {
-    environment = 'Weixin'
+    environment = "Weixin";
   }
-  const isWelink = ua.indexOf('huawei-anyoffice') != -1
+  const isWelink = ua.indexOf("huawei-anyoffice") != -1;
   if (isWelink) {
-    environment = 'Welink'
+    environment = "Welink";
   }
-  const isDingDing = ua.indexOf('dingtalk') != -1
+  const isDingDing = ua.indexOf("dingtalk") != -1;
   if (isDingDing) {
-    environment = 'isDingDing'
+    environment = "isDingDing";
   }
-  if (environment === '') {
-    environment = 'otherBrowser'
+  if (environment === "") {
+    environment = "otherBrowser";
   }
-  return environment
+  return environment;
 }
 
 export function timestampToTime(timestamp) {
-  const date = new Date(timestamp) // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
-  const Y = date.getFullYear() + '-'
+  const date = new Date(timestamp); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
+  const Y = date.getFullYear() + "-";
   const M =
     (date.getMonth() + 1 < 10
-      ? '0' + (date.getMonth() + 1)
-      : date.getMonth() + 1) + '-'
-  const D = date.getDate() + ' '
-  let h = date.getHours()
-  h = h < 10 ? `0${h}:` : h + ':'
-  let m = date.getMinutes()
-  m = m < 10 ? `0${m}:` : m + ':'
-  let s = date.getSeconds()
-  s = s < 10 ? `0${s}` : s
-  return Y + M + D + h + m + s
+      ? "0" + (date.getMonth() + 1)
+      : date.getMonth() + 1) + "-";
+  const D = date.getDate() + " ";
+  let h = date.getHours();
+  h = h < 10 ? `0${h}:` : h + ":";
+  let m = date.getMinutes();
+  m = m < 10 ? `0${m}:` : m + ":";
+  let s = date.getSeconds();
+  s = s < 10 ? `0${s}` : s;
+  return Y + M + D + h + m + s;
 }
 export function isCreditCode(s) {
   const reg = /[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g;
-  return reg.test(s)
+  return reg.test(s);
 }
 
-
-
-
-
 export function add_sum(arg1, arg2) {
   var r1, r2, m;
   try {
@@ -370,14 +381,14 @@ export function accMul(arg1, arg2) {
 
   try {
     m += s1.split(".")[1].length;
-  } catch (e) { }
+  } catch (e) {}
 
   try {
     m += s2.split(".")[1].length;
-  } catch (e) { }
+  } catch (e) {}
 
   return (
     (Number(s1.replace(".", "")) * Number(s2.replace(".", ""))) /
     Math.pow(10, m)
   );
-}
+}

src/views/goodStore/goodsOnline/components/handle-online-form.vue

@@ -73,15 +73,7 @@
 <script>
 import costFormAddEdit from "./costFormAddEdit";
 import asyncRequest from "@/apis/service/goodStore/goodsOnline";
-import {
-  isnumber,
-  isMobile,
-  validEmail,
-  isAlphanumeric,
-  isChinese,
-  isEmoticon,
-  validAlphabets,
-} from "@/utils/validate";
+import { isnumber, isAlphanumeric, validAlphabets } from "@/utils/validate";
 export default {
   name: "exam-form",
   props: ["size", "statusList", "disabled", "isMust", "labelWidth", "id", "code"],