|
@@ -16,8 +16,8 @@ export const wechart = /^[a-zA-Z][a-zA-Z0-9_-]{5,19}$/;
|
|
|
export const password = /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\\W_!@#$%^&*`~()-+=]+$)(?![0-9\\W_!@#$%^&*`~()-+=]+$)[a-zA-Z0-9\\W_!@#$%^&*`~()-+=]{8,30}$/;
|
|
|
|
|
|
export const url = /^(https?|ftp|file):\/\/[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]/;
|
|
|
-// 数字+字母+_
|
|
|
-export const number_letter = /^[0-9a-zA-Z_]*$/;
|
|
|
+// 数字+字母+_+-
|
|
|
+export const number_letter = /^[0-9a-zA-Z_\-\/]*$/;
|
|
|
|
|
|
// 数字+字母
|
|
|
export const numberLetter = /^[0-9a-zA-Z]*$/;
|
|
@@ -33,18 +33,18 @@ export const checkTel = val => tel.test(val);
|
|
|
export const checkEmail = val => email.test(val);
|
|
|
// 身份证
|
|
|
export const checkIDCard = val => IDCard.test(val);
|
|
|
- // 校验15或18位
|
|
|
-export function checkIDCard2(val){
|
|
|
- const city={11:"北京",12:"天津",13:"河北",14:"山西",15:"内蒙古",21:"辽宁",22:"吉林",23:"黑龙江 ",31:"上海",32:"江苏",33:"浙江",34:"安徽",35:"福建",36:"江西",37:"山东",41:"河南",42:"湖北 ",43:"湖南",44:"广东",45:"广西",46:"海南",50:"重庆",51:"四川",52:"贵州",53:"云南",54:"西藏 ",61:"陕西",62:"甘肃",63:"青海",64:"宁夏",65:"新疆",71:"台湾",81:"香港",82:"澳门",91:"国外 "};
|
|
|
- let pass= true;
|
|
|
+// 校验15或18位
|
|
|
+export function checkIDCard2(val) {
|
|
|
+ const city = { 11: "北京", 12: "天津", 13: "河北", 14: "山西", 15: "内蒙古", 21: "辽宁", 22: "吉林", 23: "黑龙江 ", 31: "上海", 32: "江苏", 33: "浙江", 34: "安徽", 35: "福建", 36: "江西", 37: "山东", 41: "河南", 42: "湖北 ", 43: "湖南", 44: "广东", 45: "广西", 46: "海南", 50: "重庆", 51: "四川", 52: "贵州", 53: "云南", 54: "西藏 ", 61: "陕西", 62: "甘肃", 63: "青海", 64: "宁夏", 65: "新疆", 71: "台湾", 81: "香港", 82: "澳门", 91: "国外 " };
|
|
|
+ let pass = true;
|
|
|
|
|
|
- if(!val || !/^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i.test(val)){
|
|
|
+ if (!val || !/^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i.test(val)) {
|
|
|
//身份证号格式错误
|
|
|
- pass = false;
|
|
|
- }else if(!city[val.substr(0,2)]){
|
|
|
+ pass = false;
|
|
|
+ } else if (!city[val.substr(0, 2)]) {
|
|
|
//地址编码错误
|
|
|
- pass = false;
|
|
|
- }else {
|
|
|
+ pass = false;
|
|
|
+ } else {
|
|
|
//18位身份证需要验证最后一位校验位
|
|
|
if (val.length == 18) {
|
|
|
// idcard = val.split('');
|
|
@@ -157,4 +157,4 @@ export class SplitIdCard {
|
|
|
birthday = birthday.replace(/(.{4})(.{2})/, "$1-$2-");
|
|
|
return birthday;
|
|
|
}
|
|
|
-}
|
|
|
+}
|