diff --git a/litemall-admin/src/utils/validate.js b/litemall-admin/src/utils/validate.js index ada0e7e2..898e655b 100644 --- a/litemall-admin/src/utils/validate.js +++ b/litemall-admin/src/utils/validate.js @@ -2,11 +2,6 @@ * Created by jiachenpan on 16/11/18. */ -export function isvalidUsername(str) { - const valid_map = ['admin', 'editor'] - return valid_map.indexOf(str.trim()) >= 0 -} - /* 合法uri*/ export function validateURL(textval) { const urlregex = /^(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.,?'\\+&%$#=~_-]+))*$/ diff --git a/litemall-admin/src/views/login/index.vue b/litemall-admin/src/views/login/index.vue index fe98db98..876f5fb5 100644 --- a/litemall-admin/src/views/login/index.vue +++ b/litemall-admin/src/views/login/index.vue @@ -46,13 +46,6 @@ export default { name: 'Login', data() { - const validateUsername = (rule, value, callback) => { - if (validateUsername == null) { - callback(new Error('请输入正确的管理员用户名')) - } else { - callback() - } - } const validatePassword = (rule, value, callback) => { if (value.length < 6) { callback(new Error('管理员密码长度应大于6')) @@ -66,8 +59,11 @@ export default { password: 'admin123' }, loginRules: { - username: [{ required: true, trigger: 'blur', validator: validateUsername }], - password: [{ required: true, trigger: 'blur', validator: validatePassword }] + username: [{ required: true, message: '管理员账户不允许为空', trigger: 'blur' }], + password: [ + { required: true, message: '管理员密码不允许为空', trigger: 'blur' }, + { validator: validatePassword, trigger: 'blur' } + ] }, passwordType: 'password', loading: false