From e12f7a0cbf8c83231a125418021ca9d662f4bddc Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期五, 15 十二月 2023 16:21:09 +0800
Subject: [PATCH] bug修改
---
src/layout/components/Register/index.vue | 2 +-
src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue | 4 ++--
src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue | 2 +-
.env.production | 4 ++--
src/utils/validate.js | 7 ++++---
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/.env.production b/.env.production
index e566a4c..d03b582 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
VITE_APP_ENV = 'production'
# 智慧安评/生产环境
-VITE_APP_BASE_API = '/api'
+VITE_APP_BASE_API = 'http://121.239.169.30:8088/api'
# 是否在打包时开启压缩，支持 gzip 和 brotli
-VITE_BUILD_COMPRESS = gzip
\ No newline at end of file
+VITE_BUILD_COMPRESS = gzip
diff --git a/src/layout/components/Register/index.vue b/src/layout/components/Register/index.vue
index c834c95..d9aa4f3 100644
--- a/src/layout/components/Register/index.vue
+++ b/src/layout/components/Register/index.vue
@@ -421,7 +421,7 @@
callback()
}else{
if(!verifyUsername(value)){
- callback(new Error('用户名须使用字母+数字，长度在5-16之间'))
+ callback(new Error('用户名须使用字母或数字，长度在5-16之间'))
}else{
let param = {}
if(state.title=='新增/注册') {
diff --git a/src/utils/validate.js b/src/utils/validate.js
index e78759b..00968b1 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -1,5 +1,5 @@
/**
- * 判断url是否是http或https
+ * 判断url是否是http或https
* @param {string} path
* @returns {Boolean}
*/
@@ -22,7 +22,8 @@
}
export function verifyUsername(val) {
- var regex = /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d]{5,16}$/; // 正则表达式，\d 匹配数字，{11} 表示匹配11次
+ // var regex = /^(?=.*[a-zA-Z])|(?=.*\d)[a-zA-Z\d]{5,16}$/; // 正则表达式，\d 匹配数字，{11} 表示匹配11次
+ var regex = /^[0-9a-zA-Z]{5,16}$/g
return regex.test(val);
}
@@ -112,4 +113,4 @@
export function verifyIdCard(val) {
var regex = /^[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]$/;
return regex.test(val)
-}
\ No newline at end of file
+}
diff --git a/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue b/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue
index 2f61cd3..5f79b4b 100644
--- a/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue
+++ b/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue
@@ -3,7 +3,7 @@
<el-dialog
v-model="dialogVisible"
:title="state.title"
- width="800px"
+ width="830px"
:before-close="handleClose"
>
<el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="110px" >
@@ -217,7 +217,7 @@
callback(new Error('请输入登录时用户名'))
}else{
if(!verifyUsername(value)){
- callback(new Error('用户名须使用字母+数字，长度在5-16之间'))
+ callback(new Error('用户名须使用字母或数字，长度在5-16之间'))
}else{
let param = {}
if(state.title=='新增') {
diff --git a/src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue b/src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue
index 00cc2cb..3396fab 100644
--- a/src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue
+++ b/src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue
@@ -105,7 +105,7 @@
callback(new Error('请输入登录时用户名'))
}else{
if(!verifyUsername(value)){
- callback(new Error('用户名须使用字母+数字，长度在5-16之间'))
+ callback(new Error('用户名须使用字母或数字，长度在5-16之间'))
}else{
let param = {}
if(state.title=='新增') {
--
Gitblit v1.9.2