diff --git a/src/apis/userManage.js b/src/apis/userManage.js index 98688ff..1b91b6b 100644 --- a/src/apis/userManage.js +++ b/src/apis/userManage.js @@ -64,9 +64,9 @@ export function associatedUserVoicesApi(data) { * @param {*} * @returns */ -export function userListFindByIdApi() { +export function userListFindByIdApi(id) { return request({ - url: ` /wxCUserBasicInfo/findById?id=${id}`, + url: `/wxCUserBasicInfo/findById?id=${id}`, method: 'get' }) } @@ -110,7 +110,7 @@ export function rechargeListApi(params) { } /** - * @description 充值列表 + * @description 视频列表 * @param {*} (pageNum,pageSize) * @returns data */ @@ -123,7 +123,7 @@ export function videoListApi(params) { } /** - * @description 充值列表-查看 + * @description 视频列表-查看 * @param {*} * @returns */ @@ -135,7 +135,7 @@ export function videoListFindByIdApi(id) { } /** - * @description 充值列表-删除 + * @description 视频列表-删除 * @param {*} * @returns */ diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts index e5c7bdb..6f8d200 100644 --- a/src/types/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -2,9 +2,6 @@ export {} declare global { const EffectScope: typeof import('vue')['EffectScope'] - const ElForm: typeof import('element-plus/es')['ElForm'] - const ElMessage: typeof import('element-plus/es')['ElMessage'] - const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] const asyncComputed: typeof import('@vueuse/core')['asyncComputed'] const autoResetRef: typeof import('@vueuse/core')['autoResetRef'] const computed: typeof import('vue')['computed'] @@ -271,9 +268,6 @@ import { UnwrapRef } from 'vue' declare module 'vue' { interface ComponentCustomProperties { readonly EffectScope: UnwrapRef - readonly ElForm: UnwrapRef - readonly ElMessage: UnwrapRef - readonly ElMessageBox: UnwrapRef readonly asyncComputed: UnwrapRef readonly autoResetRef: UnwrapRef readonly computed: UnwrapRef diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 823079a..5d6192a 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -12,56 +12,10 @@ declare module '@vue/runtime-core' { CutImg1: typeof import('./../components/cutImg1.vue')['default'] EditPosition: typeof import('./../components/EditPosition.vue')['default'] 'EditPosition copy': typeof import('./../components/EditPosition copy.vue')['default'] - ElAlert: typeof import('element-plus/es')['ElAlert'] - ElButton: typeof import('element-plus/es')['ElButton'] - ElCard: typeof import('element-plus/es')['ElCard'] - ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] - ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] - ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] - ElDialog: typeof import('element-plus/es')['ElDialog'] - ElDropdown: typeof import('element-plus/es')['ElDropdown'] - ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] - ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] - ElForm: typeof import('element-plus/es')['ElForm'] - ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] - ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] - ElMenu: typeof import('element-plus/es')['ElMenu'] - ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] - ElMenuItemGroup: typeof import('element-plus/es')['ElMenuItemGroup'] - ElOption: typeof import('element-plus/es')['ElOption'] - ElPagination: typeof import('element-plus/es')['ElPagination'] - ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] - ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] - ElSwitch: typeof import('element-plus/es')['ElSwitch'] - ElTable: typeof import('element-plus/es')['ElTable'] - ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElTag: typeof import('element-plus/es')['ElTag'] - ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElUpload: typeof import('element-plus/es')['ElUpload'] GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default'] Hamburger: typeof import('./../components/Hamburger/index.vue')['default'] IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] - IEpAvatar: typeof import('~icons/ep/avatar')['default'] - IEpCloseBold: typeof import('~icons/ep/close-bold')['default'] - IEpCollection: typeof import('~icons/ep/collection')['default'] - IEpDelete: typeof import('~icons/ep/delete')['default'] - IEpDownload: typeof import('~icons/ep/download')['default'] - IEpEdit: typeof import('~icons/ep/edit')['default'] - IEpHouse: typeof import('~icons/ep/house')['default'] - IEpLink: typeof import('~icons/ep/link')['default'] - IEpLoading: typeof import('~icons/ep/loading')['default'] - IEpLock: typeof import('~icons/ep/lock')['default'] - IEpPlus: typeof import('~icons/ep/plus')['default'] - IEpPointer: typeof import('~icons/ep/pointer')['default'] - IEpRefresh: typeof import('~icons/ep/refresh')['default'] - IEpSearch: typeof import('~icons/ep/search')['default'] - IEpUser: typeof import('~icons/ep/user')['default'] - IEpUserFilled: typeof import('~icons/ep/user-filled')['default'] - IEpVideoPlay: typeof import('~icons/ep/video-play')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] MultiUpload: typeof import('./../components/Upload/MultiUpload.vue')['default'] MyLoading: typeof import('./../components/myLoading.vue')['default'] @@ -75,8 +29,4 @@ declare module '@vue/runtime-core' { TalkUs: typeof import('./../components/talkUs.vue')['default'] WangEditor: typeof import('./../components/WangEditor/index.vue')['default'] } - export interface ComponentCustomProperties { - vInfiniteScroll: typeof import('element-plus/es')['ElInfiniteScroll'] - vLoading: typeof import('element-plus/es')['ElLoadingDirective'] - } } diff --git a/src/views/userManage/personMould.vue b/src/views/userManage/personMould.vue index 01fd05a..6829610 100644 --- a/src/views/userManage/personMould.vue +++ b/src/views/userManage/personMould.vue @@ -22,7 +22,7 @@ import dayjs from "dayjs"; const emit = defineEmits(["close"]); const props = defineProps({ - serviceId: { + cUserId: { required: true, } }); @@ -38,7 +38,7 @@ const tableData = ref([]); const modelAllListFunc = async () => { try { const res = await personMouldListApi(1, 10000); - const modelIds = await userPersonMouldIdListApi(props.serviceId); + const modelIds = await userPersonMouldIdListApi(props.cUserId); tableData.value = res.data.list; total.value = res.data.total * 1; setTimeout(()=> { @@ -57,7 +57,7 @@ const modelAllListFunc = async () => { const addModel = async () => { const data = { mouldIds: checkboxGroup.value, - cUserId: props.serviceId + userId: props.cUserId } const res = await associatedUserMouldsApi(data); if(res.code === 200) { diff --git a/src/views/userManage/personVoice.vue b/src/views/userManage/personVoice.vue new file mode 100644 index 0000000..ff5ad17 --- /dev/null +++ b/src/views/userManage/personVoice.vue @@ -0,0 +1,143 @@ + + + diff --git a/src/views/userManage/rechargeList.vue b/src/views/userManage/rechargeList.vue index 71a0385..39b133c 100644 --- a/src/views/userManage/rechargeList.vue +++ b/src/views/userManage/rechargeList.vue @@ -6,7 +6,7 @@ - + - 查询 + 查询 @@ -31,28 +33,32 @@ border > + > + + @@ -110,8 +116,12 @@ const pageSize = ref(10); const total = ref(0); +const getPayVendor = (val) => { + return val === 2 ? "微信" : "支付宝"; +}; + const getDate = (val) => { - return dayjs(val).format("YYYY-MM-DD"); + return dayjs(val).format("YYYY-MM-DD HH:mm:ss"); }; const handleSizeChange = (val) => { @@ -125,7 +135,7 @@ }; const formInline = ref({ - phone: '', + phone: route.query.phone || '', productTitle: '', time: '' }) @@ -135,11 +145,11 @@ const formInline = ref({ let data = { PageNum: PageNum || 1, PageSize: PageSize || 10, - phone: formInline.phone, + phone: formInline.value.phone, projectType: 2, - productTitle: formInline.productTitle, - startDate: formInline.time ? formInline.time[0] : '', - endDate: formInline.time ? formInline.time[1] : '', + productTitle: formInline.value.productTitle, + startDate: formInline.value.time ? formInline.value.time[0] : '', + endDate: formInline.value.time ? formInline.value.time[1] : '', } const res = await rechargeListApi(data); tableData.value = res.data.list; diff --git a/src/views/userManage/userList.vue b/src/views/userManage/userList.vue index 0f5ec96..14da89c 100644 --- a/src/views/userManage/userList.vue +++ b/src/views/userManage/userList.vue @@ -6,7 +6,7 @@ - 新增 + 查询 @@ -19,43 +19,44 @@ border > + + + - - - @@ -77,18 +78,30 @@ - - - + + + + + + + + + - Create - Cancel + 关闭 + + + + + + + @@ -103,6 +116,8 @@ import dayjs from "dayjs"; import { useRoute, useRouter } from "vue-router"; + import model from './personMould.vue' + import voice from './personVoice.vue' const route = useRoute(); const router = useRouter(); @@ -135,7 +150,7 @@ const total = ref(0); const getDate = (val) => { - return dayjs(val).format("YYYY-MM-DD"); + return dayjs(val).format("YYYY-MM-DD HH:mm:ss"); }; const handleSizeChange = (val) => { @@ -155,9 +170,9 @@ const formInline = ref({ const getListData = async (PageNum, PageSize) => { try { let data = { - PageNum: PageNum, - PageSize: PageSize, - phone: formInline.phone + PageNum: PageNum || 1, + PageSize: PageSize || 10, + phone: formInline.value.phone } const res = await userListApi(data); console.log(res, "res"); @@ -176,11 +191,27 @@ const formInline = ref({ function showDetail(id) { userListFindByIdApi(id).then(res => { detailDialogVisible.value = true + res.data.createDate = getDate(res.data.createDate) form.value = res.data }) } function handleClose() { detailDialogVisible.value = false + modelDialogVisible.value = false + voiceDialogVisible.value = false + } + + const modelDialogVisible = ref(false) + const cUserId = ref('') + function personMould(id) { + modelDialogVisible.value = true + cUserId.value = id + } + + const voiceDialogVisible = ref(false) + function personVoice(id) { + voiceDialogVisible.value = true + cUserId.value = id } onMounted(() => { diff --git a/src/views/userManage/userMouldList.vue b/src/views/userManage/userMouldList.vue index 922fa04..cdfb3e9 100644 --- a/src/views/userManage/userMouldList.vue +++ b/src/views/userManage/userMouldList.vue @@ -9,7 +9,7 @@ - 查询 + 查询 @@ -22,20 +22,38 @@ border > + + + + + +