Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子Li

2021-11-28 a627de02c750f6af4c524aff75d28343226f2a82

Merge remote-tracking branch 'origin/dev' into dev

 ruoyi-ui/src/utils/index.js

@@ -381,7 +381,7 @@

// 下划转驼峰
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) {

 ruoyi-ui/src/views/register.vue

@@ -127,7 +127,8 @@
          register(this.registerForm).then(res => {
            const username = this.registerForm.username;
            this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
              dangerouslyUseHTMLString: true
              dangerouslyUseHTMLString: true,
              type: 'success'
            }).then(() => {
              this.$router.push("/login");
            }).catch(() => {});