Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/utils/index.js
ruoyi-ui/src/views/register.vue
| | |
|---|
| | | |
|---|
| | | // 下划转驼峰 |
|---|
| | | 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) { |
|---|
| | |
|---|
| | | 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(() => {}); |
|---|
