zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: clean up code formatting and adjust user model is_active field to null

Browse Source
This commit is contained in:
wxg0103 2025-07-30 16:26:12 +08:00
parent 83a53e61b6
commit 9f31832b4d
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/src/views/chat/user-login/index.vue
View File

@ -179,6 +179,7 @@ import QrCodeTab from '@/views/chat/user-login/scanCompinents/QrCodeTab.vue'
import {MsgConfirm, MsgError} from '@/utils/message.ts' import {MsgConfirm, MsgError} from '@/utils/message.ts'
import PasswordAuth from '@/views/chat/auth/component/password.vue' import PasswordAuth from '@/views/chat/auth/component/password.vue'
import {isAppIcon} from '@/utils/common' import {isAppIcon} from '@/utils/common'
useResize() useResize()
const router = useRouter() const router = useRouter()
@ -330,7 +331,8 @@ function redirectAuth(authType: string, needMessage: boolean = false) {
.then(() => { .then(() => {
window.location.href = url window.location.href = url
}) })
.catch(() => {}) .catch(() => {
})
} else { } else {
console.log('url', url) console.log('url', url)
window.location.href = url window.location.href = url
@ -378,7 +380,7 @@ onBeforeMount(() => {
// modeList需要去掉lark wecom dingtalk // modeList需要去掉lark wecom dingtalk
modeList.value = modeList.value.filter((item) => !['lark', 'wecom', 'dingtalk'].includes(item)) modeList.value = modeList.value.filter((item) => !['lark', 'wecom', 'dingtalk'].includes(item))
if (QrList.value.length > 0) { if (QrList.value.length > 0) {
modeList.value.push('QR_CODE') modeList.value = ['QR_CODE', ...modeList.value]
QrList.value.forEach((item) => { QrList.value.forEach((item) => {
orgOptions.value.push({ orgOptions.value.push({
key: item, key: item,
@ -409,12 +411,15 @@ onBeforeMount(() => {
border-bottom: 1px solid var(--el-border-color); border-bottom: 1px solid var(--el-border-color);
} }
} }
.user-login-container { .user-login-container {
width: 480px; width: 480px;
.login-card { .login-card {
padding: 18px; padding: 18px;
} }
} }
.login-gradient-divider { .login-gradient-divider {
position: relative; position: relative;
text-align: center; text-align: center;

2
ui/src/views/system/user-manage/index.vue
View File

@ -312,7 +312,7 @@ const search_form = ref<{
username: '', username: '',
nick_name: '', nick_name: '',
email: '', email: '',
is_active: true, is_active: null,
source: '', source: '',
}) })