diff --git a/package.json b/package.json index ff94abd..40e977b 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "private": false, "scripts": { "i": "pnpm install", - "dev": "vite --mode env.local", + "dev": "vite --mode env.local --host 0.0.0.0", "dev-server": "vite --mode dev", "ts:check": "vue-tsc --noEmit", "build:local": "node --max_old_space_size=4096 ./node_modules/vite/bin/vite.js build", @@ -25,7 +25,7 @@ "lint:lint-staged": "lint-staged -c " }, "dependencies": { - "@element-plus/icons-vue": "^2.1.0", + "@element-plus/icons-vue": "^2.3.1", "@form-create/designer": "^3.2.6", "@form-create/element-ui": "^3.2.11", "@iconify/iconify": "^3.1.1", diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index beb6e51..94b67e2 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -17,6 +17,8 @@ export interface UserVO { createTime: Date } + + // 查询用户管理列表 export const getUserPage = (params: PageParam) => { return request.get({ url: '/system/user/page', params }) @@ -79,3 +81,20 @@ export const updateUserStatus = (id: number, status: number) => { export const getSimpleUserList = (): Promise => { return request.get({ url: '/system/user/simple-list' }) } + +/** + * 查询审核列表 + */ +export const getExamieList = (audit: number) => { + return request.get({ url: '/system/user/auditList?audit=' + audit }) +} + +/** + * 审核用户 + */ +export function examineUser(data) { + + console.log('data=>', data) + + return request.put({url: '/system/user/user_audit', data}) +} diff --git a/src/main.ts b/src/main.ts index 874f766..8bce92f 100644 --- a/src/main.ts +++ b/src/main.ts @@ -42,6 +42,9 @@ import Logger from '@/utils/Logger' import VueDOMPurifyHTML from 'vue-dompurify-html' // 解决v-html 的安全隐患 +import elementIcon from "./plugins/icons" + + // 创建实例 const setupAll = async () => { const app = createApp(App) @@ -58,6 +61,7 @@ const setupAll = async () => { setupRouter(app) + // directives 指令 setupAuth(app) setupMountedFocus(app) @@ -66,6 +70,8 @@ const setupAll = async () => { app.use(VueDOMPurifyHTML) + app.use(elementIcon) + app.mount('#app') } diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 1134152..61bc1f4 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -129,6 +129,8 @@ export enum DICT_TYPE { SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status', SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type', SYSTEM_SOCIAL_TYPE = 'system_social_type', + USER_AUDIT_TYPE = 'user_audit_type', + WX_USER_TYPE = 'wx_user_type', // ========== INFRA 模块 ========== INFRA_BOOLEAN_STRING = 'infra_boolean_string', diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 7e3e6e1..9bc1349 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -226,7 +226,10 @@ const queryParams = reactive({ mobile: undefined, status: undefined, deptId: undefined, + audit: "2", + userType: "3", createTime: [] + }) const queryFormRef = ref() // 搜索的表单