diff --git a/src/api/member/level/index.ts b/src/api/member/level/index.ts index 540bfe4b..0ded493a 100644 --- a/src/api/member/level/index.ts +++ b/src/api/member/level/index.ts @@ -12,8 +12,8 @@ export interface LevelVO { } // 查询会员等级列表 -export const getLevelPage = async (params) => { - return await request.get({ url: `/member/level/page`, params }) +export const getLevelList = async (params) => { + return await request.get({ url: `/member/level/list`, params }) } // 查询会员等级详情 diff --git a/src/api/member/user/index.ts b/src/api/member/user/index.ts index 432a0fb5..3a789e9f 100644 --- a/src/api/member/user/index.ts +++ b/src/api/member/user/index.ts @@ -51,3 +51,8 @@ export const getUser = async (id: number) => { export const updateUser = async (data: UserVO) => { return await request.put({ url: `/member/user/update`, data }) } + +// 修改会员用户等级 +export const updateUserLevel = async (data: any) => { + return await request.put({ url: `/member/user/update-level`, data }) +} diff --git a/src/views/member/level/index.vue b/src/views/member/level/index.vue index 88774a11..58fbcddb 100644 --- a/src/views/member/level/index.vue +++ b/src/views/member/level/index.vue @@ -96,13 +96,6 @@ - - @@ -122,11 +115,8 @@ const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 const loading = ref(true) // 列表的加载中 -const total = ref(0) // 列表的总页数 const list = ref([]) // 列表的数据 const queryParams = reactive({ - pageNo: 1, - pageSize: 10, name: null, status: null }) @@ -136,9 +126,7 @@ const queryFormRef = ref() // 搜索的表单 const getList = async () => { loading.value = true try { - const data = await LevelApi.getLevelPage(queryParams) - list.value = data.list - total.value = data.total + list.value = await LevelApi.getLevelList(queryParams) } finally { loading.value = false } @@ -146,7 +134,6 @@ const getList = async () => { /** 搜索按钮操作 */ const handleQuery = () => { - queryParams.pageNo = 1 getList() } diff --git a/src/views/member/user/UpdateLevelForm.vue b/src/views/member/user/UpdateLevelForm.vue new file mode 100644 index 00000000..e583f4a9 --- /dev/null +++ b/src/views/member/user/UpdateLevelForm.vue @@ -0,0 +1,101 @@ + + diff --git a/src/views/member/user/UserForm.vue b/src/views/member/user/UserForm.vue index 9b69b357..0da4ef61 100644 --- a/src/views/member/user/UserForm.vue +++ b/src/views/member/user/UserForm.vue @@ -60,22 +60,6 @@ - - - - - - - - - - - - @@ -95,7 +79,6 @@ import * as UserApi from '@/api/member/user' import * as AreaApi from '@/api/system/area' import { defaultProps } from '@/utils/tree' import MemberTagSelect from '@/views/member/tag/components/MemberTagSelect.vue' -import MemberLevelSelect from '@/views/member/level/components/MemberLevelSelect.vue' import MemberGroupSelect from '@/views/member/group/components/MemberGroupSelect.vue' const { t } = useI18n() // 国际化 @@ -118,18 +101,14 @@ const formData = ref({ birthday: undefined, mark: undefined, tagIds: [], - levelId: undefined, - levelReason: undefined, groupId: undefined }) const formRules = reactive({ mobile: [{ required: true, message: '手机号不能为空', trigger: 'blur' }], - status: [{ required: true, message: '状态不能为空', trigger: 'blur' }], - levelReason: [{ required: true, message: '修改原因不能为空', trigger: 'blur' }] + status: [{ required: true, message: '状态不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref const areaList = ref([]) // 地区列表 -const originLevelId = ref() // 修改前的会员等级 /** 打开弹窗 */ const open = async (type: string, id?: number) => { @@ -142,7 +121,6 @@ const open = async (type: string, id?: number) => { formLoading.value = true try { formData.value = await UserApi.getUser(id) - originLevelId.value = formData.value.levelId } finally { formLoading.value = false } @@ -194,8 +172,6 @@ const resetForm = () => { birthday: undefined, mark: undefined, tagIds: [], - levelId: undefined, - levelReason: undefined, groupId: undefined } formRef.value?.resetFields() diff --git a/src/views/member/user/index.vue b/src/views/member/user/index.vue index 18e4f370..7ddc0538 100644 --- a/src/views/member/user/index.vue +++ b/src/views/member/user/index.vue @@ -109,7 +109,7 @@ :formatter="dateFormatter" width="180px" /> - + @@ -133,6 +142,8 @@ + +