diff --git a/.gitignore b/.gitignore index 9d889fc38..f580db7f9 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,8 @@ node_modules/* **/.vscode/** *.vscode +**/.idea/** +*.idea # Use yarn package-lock.json diff --git a/src/components/newCustomFields/components/WidgetsVerifyCode.jsx b/src/components/newCustomFields/components/WidgetsVerifyCode.jsx index fd533a9de..b1f938bac 100644 --- a/src/components/newCustomFields/components/WidgetsVerifyCode.jsx +++ b/src/components/newCustomFields/components/WidgetsVerifyCode.jsx @@ -42,7 +42,7 @@ export default class WidgetsVerifyCode extends Component { isAvailable = false; } else { this.iti.setNumber(value); - if (!(this.iti.isValidNumber() || specialTelVerify(value))) { + if (!this.iti.isValidNumber() || !specialTelVerify(value)) { isAvailable = false; } } diff --git a/src/pages/accountLogin/redux/actions.js b/src/pages/accountLogin/redux/actions.js index 6b7a9b7fa..0f168d003 100644 --- a/src/pages/accountLogin/redux/actions.js +++ b/src/pages/accountLogin/redux/actions.js @@ -130,7 +130,7 @@ export const isValid = (isForSendCode, keys = [], type) => { }; //手机号验证 const isTelRule = () => { - if (!iti.isValidNumber() && !specialTelVerify(iti.getNumber())) { + if (!iti.isValidNumber() || !specialTelVerify(iti.getNumber())) { warnningData.push({ tipDom: '#txtMobilePhone', warnningText: _l('手机号格式错误') }); isRight = false; }