From e5fd1f76db721443a0d2dc0cb6aac8cfcad5c32a Mon Sep 17 00:00:00 2001 From: khejing Date: Fri, 26 Nov 2021 08:26:45 +0000 Subject: [PATCH 1/2] =?UTF-8?q?camelCase=E4=B8=AD=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E6=98=AF=E4=B8=8B=E5=88=92=E7=BA=BF=EF=BC=8C=E8=80=8C=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E6=A8=AA=E6=9D=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/utils/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/utils/index.js b/ruoyi-ui/src/utils/index.js index 2893bc83..9679e757 100644 --- a/ruoyi-ui/src/utils/index.js +++ b/ruoyi-ui/src/utils/index.js @@ -381,7 +381,7 @@ export function titleCase(str) { // 下划转驼峰 export function camelCase(str) { - return str.replace(/-[a-z]/g, str1 => str1.substr(-1).toUpperCase()) + return str.replace(/_[a-z]/g, str1 => str1.substr(-1).toUpperCase()) } export function isNumberStr(str) { From 89e7cb19b9161fb2164fcfb61fe6da2de00f0004 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 26 Nov 2021 18:11:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=B1=BB=E5=9E=8Bsuccess?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/register.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue index 7ee0a797..476aa819 100644 --- a/ruoyi-ui/src/views/register.vue +++ b/ruoyi-ui/src/views/register.vue @@ -127,7 +127,8 @@ export default { register(this.registerForm).then(res => { const username = this.registerForm.username; this.$alert("恭喜你,您的账号 " + username + " 注册成功!", '系统提示', { - dangerouslyUseHTMLString: true + dangerouslyUseHTMLString: true, + type: 'success' }).then(() => { this.$router.push("/login"); }).catch(() => {});