diff --git a/src/api/member/address/index.ts b/src/api/member/address/index.ts new file mode 100644 index 0000000000000000000000000000000000000000..cc16980d51b852d5f20f69f6b52876f79f719033 --- /dev/null +++ b/src/api/member/address/index.ts @@ -0,0 +1,40 @@ +import request from '@/config/axios' + +export interface AddressVO { + id: number + name: string + mobile: string + areaId: number + detailAddress: string + defaultStatus: boolean +} + +// 查询用户收件地址列表 +export const getAddressPage = async (params) => { + return await request.get({ url: `/member/address/page`, params }) +} + +// 查询用户收件地址详情 +export const getAddress = async (id: number) => { + return await request.get({ url: `/member/address/get?id=` + id }) +} + +// 新增用户收件地址 +export const createAddress = async (data: AddressVO) => { + return await request.post({ url: `/member/address/create`, data }) +} + +// 修改用户收件地址 +export const updateAddress = async (data: AddressVO) => { + return await request.put({ url: `/member/address/update`, data }) +} + +// 删除用户收件地址 +export const deleteAddress = async (id: number) => { + return await request.delete({ url: `/member/address/delete?id=` + id }) +} + +// 导出用户收件地址 Excel +export const exportAddress = async (params) => { + return await request.download({ url: `/member/address/export-excel`, params }) +} diff --git a/src/api/member/user/index.ts b/src/api/member/user/index.ts index 432a0fb5b7248cc24788752ce6effce7b4391883..8deae4a91ebaf3feec1deda83178de66973d5a69 100644 --- a/src/api/member/user/index.ts +++ b/src/api/member/user/index.ts @@ -1,21 +1,21 @@ import request from '@/config/axios' export interface UserVO { + areaId: number | undefined + areaName: string | undefined + avatar: string | undefined + birthday: number | undefined + createTime: number | undefined id: number + loginDate: number | undefined + loginIp: string + mark: string mobile: string - password: string - status: number + name: string | undefined + nickname: string | undefined registerIp: string - loginIp: string - loginDate: Date - nickname: string - avatar: string - name: string sex: number - areaId: number - birthday: Date - mark: string - createTime: Date + status: number } // TODO @梦:和 UserVO 搞成一个把。 @@ -32,6 +32,7 @@ export interface UserBaseInfoVO { name: string | null | undefined sex: number areaId: number | null | undefined + areaName: string | null | undefined birthday: Date | null | undefined mark: string | null | undefined createTime: Date | null | undefined diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 2d8e2b4467c56b0586a8151327f20145dc72f33c..8bd56119d674b4c61886d488823676a97f3c6558 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -434,7 +434,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ meta: { hidden: true }, children: [ { - path: 'user/detail', + path: 'user/detail/:userId', name: 'MemberUserDetail', meta: { title: '会员详情', diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts index 5e5c854d6a8200343a9e53d9a3f8a2fff164c07b..8740926097a4063977b2b4b7740b98c8870aea5d 100644 --- a/src/utils/formatTime.ts +++ b/src/utils/formatTime.ts @@ -11,7 +11,7 @@ import dayjs from 'dayjs' * @description format 季度 + 星期 + 几周:"YYYY-mm-dd HH:MM:SS WWW QQQQ ZZZ" * @returns 返回拼接后的时间字符串 */ -export function formatDate(date: Date, format?: string): string { +export function formatDate(date: Date | number, format?: string): string { // 日期不存在,则返回空 if (!date) { return '' diff --git a/src/views/member/user/components/account-info.vue b/src/views/member/user/components/AccountInfo.vue similarity index 100% rename from src/views/member/user/components/account-info.vue rename to src/views/member/user/components/AccountInfo.vue diff --git a/src/views/member/user/components/AddressList.vue b/src/views/member/user/components/AddressList.vue new file mode 100644 index 0000000000000000000000000000000000000000..af6ef83d801e9b71e21552de347a7151be413961 --- /dev/null +++ b/src/views/member/user/components/AddressList.vue @@ -0,0 +1,80 @@ + + + + diff --git a/src/views/member/user/components/card-title.vue b/src/views/member/user/components/CardTitle.vue similarity index 100% rename from src/views/member/user/components/card-title.vue rename to src/views/member/user/components/CardTitle.vue diff --git a/src/views/member/user/components/point-list.vue b/src/views/member/user/components/PointList.vue similarity index 96% rename from src/views/member/user/components/point-list.vue rename to src/views/member/user/components/PointList.vue index 2b2b98e45dab5074d4806ba44ead050e9030acd8..a98a622f7b352206d4a24692c98698bf9041c87c 100644 --- a/src/views/member/user/components/point-list.vue +++ b/src/views/member/user/components/PointList.vue @@ -17,7 +17,7 @@ > @@ -112,7 +112,7 @@ const queryParams = reactive({ bizType: undefined, title: null, createDate: [], - userId: null + userId: NaN }) const queryFormRef = ref() // 搜索的表单 @@ -140,9 +140,8 @@ const resetQuery = () => { handleQuery() } -// TODO @梦:改成 userId 哈 -const { memberId } = defineProps({ - memberId: { +const { userId } = defineProps({ + userId: { type: Number, required: true } @@ -150,7 +149,7 @@ const { memberId } = defineProps({ /** 初始化 **/ onMounted(() => { - queryParams.userId = memberId + queryParams.userId = userId getList() }) diff --git a/src/views/member/user/components/sign-list.vue b/src/views/member/user/components/SignList.vue similarity index 97% rename from src/views/member/user/components/sign-list.vue rename to src/views/member/user/components/SignList.vue index 479e18a7ac75a8c4dbbc96cdaebbc7ff1b9d21a8..47fbd155aaec85c0b06db281a1aaea8e9c3c8071 100644 --- a/src/views/member/user/components/sign-list.vue +++ b/src/views/member/user/components/SignList.vue @@ -92,6 +92,7 @@ const list = ref([]) // 列表的数据 const queryParams = reactive({ pageNo: 1, pageSize: 10, + userId: NaN, nickname: null, day: null, createTime: [] @@ -122,9 +123,8 @@ const resetQuery = () => { handleQuery() } -// TODO @梦:改成 userId 哈 -const { memberId } = defineProps({ - memberId: { +const { userId } = defineProps({ + userId: { type: Number, required: true } @@ -132,7 +132,7 @@ const { memberId } = defineProps({ /** 初始化 **/ onMounted(() => { - queryParams.userId = memberId + queryParams.userId = userId getList() }) diff --git a/src/views/member/user/components/UserBasicInfo.vue b/src/views/member/user/components/UserBasicInfo.vue new file mode 100644 index 0000000000000000000000000000000000000000..50d16413de07c6508146f410f18ec29017c17d5b --- /dev/null +++ b/src/views/member/user/components/UserBasicInfo.vue @@ -0,0 +1,90 @@ + + + diff --git a/src/views/member/user/components/address-list.vue b/src/views/member/user/components/address-list.vue deleted file mode 100644 index 6d47bda53299d9fb4ea8ee59598dea02981085c3..0000000000000000000000000000000000000000 --- a/src/views/member/user/components/address-list.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/src/views/member/user/components/descriptions/DescriptionsItemLabel.vue b/src/views/member/user/components/descriptions/DescriptionsItemLabel.vue new file mode 100644 index 0000000000000000000000000000000000000000..357833513f0bdb16fdfd3c1610558f13d6314455 --- /dev/null +++ b/src/views/member/user/components/descriptions/DescriptionsItemLabel.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/views/member/user/detail/index.vue b/src/views/member/user/detail/index.vue index c77934d14919988df16d3b36754fd508c2120f99..967a411049a05e59c039d47f50084a431b3e6491 100644 --- a/src/views/member/user/detail/index.vue +++ b/src/views/member/user/detail/index.vue @@ -1,12 +1,11 @@ - + - + 成长值(WIP) 余额(WIP) + + + + 订单管理(WIP) + 售后管理(WIP) + 收藏记录(WIP) + 优惠劵(WIP) - - +