Merge branch 'dev_ljj_idcard' into dev

src/utils/validate.js

@@ -37,5 +37,5 @@ export function isURL(s) {
  * @param {*} s
  */
 export function isCard(s) {
-  return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|(^\w{2}\d{7}$|^\w{1}\d{8}$)/.test(s);
+  return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/.test(s);
 }