diff --git a/src/api/member/opentypehistory/index.ts b/src/api/member/opentypehistory/index.ts index ee559e83..fda42896 100644 --- a/src/api/member/opentypehistory/index.ts +++ b/src/api/member/opentypehistory/index.ts @@ -2,6 +2,12 @@ import request from '@/config/axios' // 会员开通记录 API export const OpenTypeHistoryApi = { + lastByUserId: async (params: any) => { + return await request.get({ url: `/member/open-type/history/last-by-user-id`, params }) + }, + adminOpen: async (data: any) => { + return await request.post({ url: `/member/open-type/history/admin-open`, data }) + }, page: async (params: any) => { return await request.get({ url: `/member/open-type/history/page`, params }) }, diff --git a/src/views/member/user/components/UserMemberTagForm.vue b/src/views/member/user/components/UserMemberTagForm.vue index 5e2d7eb4..707e4e18 100644 --- a/src/views/member/user/components/UserMemberTagForm.vue +++ b/src/views/member/user/components/UserMemberTagForm.vue @@ -3,7 +3,7 @@ - @@ -47,8 +47,8 @@ const open = async (id?: number) => { const data = await UserApi.getUser(id) if (data && data.memberTagList?.length) { const bizTypes = data.memberTagList.map(item => item.tagBizType) ?? [] - data.memberRecentTagList = bizTypes.filter(item => !['1', '2', '4'].includes(item)) - memberRecentTagList.value = bizTypes.filter(item => ['1', '2', '4'].includes(item)) + data.memberRecentTagList = bizTypes.filter(item => !['2', '4'].includes(item)) + memberRecentTagList.value = bizTypes.filter(item => ['2', '4'].includes(item)) } else { data.memberRecentTagList = [] memberRecentTagList.value = [] diff --git a/src/views/member/user/components/UserOpenVipForm.vue b/src/views/member/user/components/UserOpenVipForm.vue new file mode 100644 index 00000000..a2afc293 --- /dev/null +++ b/src/views/member/user/components/UserOpenVipForm.vue @@ -0,0 +1,108 @@ + + + \ No newline at end of file diff --git a/src/views/member/user/index.vue b/src/views/member/user/index.vue index c060093f..8608c4b4 100644 --- a/src/views/member/user/index.vue +++ b/src/views/member/user/index.vue @@ -153,6 +153,9 @@ 修改用户标签 + + 开通会员 + @@ -177,6 +180,8 @@ + + @@ -192,6 +197,7 @@ import UserLevelUpdateForm from './components/UserLevelUpdateForm.vue' import UserPointUpdateForm from './components/UserPointUpdateForm.vue' import UserBalanceUpdateForm from './components/UserBalanceUpdateForm.vue' import UserMemberTagForm from "./components/UserMemberTagForm.vue" +import UserOpenVipForm from "./components/UserOpenVipForm.vue" import { CouponSendForm } from '@/views/mall/promotion/coupon/components' import { checkPermi } from '@/utils/permission' @@ -221,6 +227,7 @@ const updatePointFormRef = ref() // 修改会员积分表单 const UpdateBalanceFormRef = ref() // 修改用户余额表单 const updateMemberTagFormRef = ref() // 修改用户标签表单 const userSettingFormRef = ref() // 修改用户设置表单 +const userOpenVipFormRef = ref() // 开通会员 const selectedIds = ref([]) // 表格的选中 ID 数组 // 修改朋友圈配置 @@ -310,6 +317,9 @@ const handleCommand = (command: string, row: UserApi.UserVO) => { case 'handleUpdateMemberTag': updateMemberTagFormRef.value.open(row.id) break + case 'handleOpenVipTag': + userOpenVipFormRef.value.open(row.id) + break case 'handleUpdateMemberCfg': userSettingFormRef.value.open(row.id) break