diff --git a/web/src/views/backend/user/moneyLog/index.vue b/web/src/views/backend/user/moneyLog/index.vue index e97c0e8..d89a043 100644 --- a/web/src/views/backend/user/moneyLog/index.vue +++ b/web/src/views/backend/user/moneyLog/index.vue @@ -155,14 +155,7 @@ const baTable = new baTableClass( return row.admin?.username || 'web' }, }, - { label: t('user.moneyLog.User name'), prop: 'user.username', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') }, - { - label: t('user.moneyLog.User nickname'), - prop: 'user.nickname', - align: 'center', - operator: 'LIKE', - operatorPlaceholder: t('Fuzzy query'), - }, + { label: t('user.moneyLog.User name'), prop: 'user.jk_username', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') }, { label: t('user.moneyLog.Change balance'), prop: 'money', align: 'center', operator: 'RANGE', sortable: 'custom' }, { label: t('user.moneyLog.bank_id'), prop: 'bank.bank_name', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') }, { label: t('user.moneyLog.Transaction id'), prop: 'transaction_id', align: 'center', operator: 'RANGE' }, diff --git a/web/src/views/backend/user/user/index.vue b/web/src/views/backend/user/user/index.vue index 7b40301..9ab0ee6 100644 --- a/web/src/views/backend/user/user/index.vue +++ b/web/src/views/backend/user/user/index.vue @@ -78,10 +78,9 @@ const baTable = new baTableClass( column: [ { type: 'selection', align: 'center', operator: false }, { label: t('Id'), prop: 'id', align: 'center', operator: '=', operatorPlaceholder: t('Id'), width: 70 }, - { label: t('user.user.User name'), prop: 'username', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') }, + { label: t('user.user.User name'), prop: 'jk_username', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') }, { label: t('user.user.nickname'), prop: 'nickname', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') }, { label: t('user.user.jk user id'), prop: 'jk_user_id', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') }, - { label: t('user.user.jk user name'), prop: 'jk_username', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') }, { label: t('user.user.referrer code'), prop: 'referrer_code', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query'), width: 120,}, { label: t('user.user.group'), diff --git a/web/src/views/backend/user/user/popupForm.vue b/web/src/views/backend/user/user/popupForm.vue index 18cda78..1bd1290 100644 --- a/web/src/views/backend/user/user/popupForm.vue +++ b/web/src/views/backend/user/user/popupForm.vue @@ -29,7 +29,7 @@ >