diff --git a/src/api/member/point/record/index.ts b/src/api/member/point/record/index.ts index 1c60f754..869421f1 100644 --- a/src/api/member/point/record/index.ts +++ b/src/api/member/point/record/index.ts @@ -14,6 +14,14 @@ export interface RecordVO { thawingTime: Date createDate: Date } +export interface RecordQueryVO { + bizType: string | null | undefined + title: string | null | undefined + pageNo: number + pageSize: number + userId: number | null | undefined + createDate: string[] +} // 查询用户积分记录列表 export const getRecordPage = async (params) => { diff --git a/src/api/member/signin/record/index.ts b/src/api/member/signin/record/index.ts index 7d137029..77016ddf 100644 --- a/src/api/member/signin/record/index.ts +++ b/src/api/member/signin/record/index.ts @@ -6,6 +6,15 @@ export interface SignInRecordVO { day: number point: number } +export interface SignInRecordQueryVO { + pageNo: number + pageSize: number + userId?: number + nickname: number | undefined | null + day?: number | null | undefined + point?: number | null | undefined + createTime: string[] | null | undefined +} // 查询用户签到积分列表 export const getSignInRecordPage = async (params) => { diff --git a/src/api/member/user/index.ts b/src/api/member/user/index.ts index fbeaba93..e9315370 100644 --- a/src/api/member/user/index.ts +++ b/src/api/member/user/index.ts @@ -17,7 +17,23 @@ export interface UserVO { mark: string createTime: Date } - +export interface UserBaseInfoVO { + id: number | undefined | null + mobile: string + password: string | null | undefined + status: number + registerIp: string | null | undefined + loginIp: string | null | undefined + loginDate: Date | null | undefined + nickname: string | null | undefined + avatar: string | null | undefined + name: string | null | undefined + sex: number + areaId: number | null | undefined + birthday: Date | null | undefined + mark: string | null | undefined + createTime: Date | null | undefined +} // 查询会员用户列表 export const getUserPage = async (params) => { return await request.get({ url: `/member/user/page`, params }) diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts index 3a4635f0..1a4741b6 100644 --- a/src/config/axios/service.ts +++ b/src/config/axios/service.ts @@ -31,7 +31,7 @@ let requestList: any[] = [] // 是否正在刷新中 let isRefreshToken = false // 请求白名单,无须token的接口 -const whiteList: string[] = ['/login', '/refresh-token', '/system/tenant/get-id-by-name'] +const whiteList: string[] = ['/login', '/refresh-token'] // 创建axios实例 const service: AxiosInstance = axios.create({ @@ -47,7 +47,8 @@ service.interceptors.request.use( let isToken = (config!.headers || {}).isToken === false whiteList.some((v) => { if (config.url) { - return (isToken = config.url.indexOf(v) > -1) + config.url.indexOf(v) > -1 + return (isToken = false) } }) if (getAccessToken() && !isToken) { diff --git a/src/views/Profile/components/BasicInfo.vue b/src/views/Profile/components/BasicInfo.vue index 89c0cfbe..e2189b15 100644 --- a/src/views/Profile/components/BasicInfo.vue +++ b/src/views/Profile/components/BasicInfo.vue @@ -1,5 +1,5 @@ + diff --git a/src/views/member/user/components/address-list.vue b/src/views/member/user/components/address-list.vue new file mode 100644 index 00000000..0f0ffd81 --- /dev/null +++ b/src/views/member/user/components/address-list.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/member/user/components/balance-list.vue b/src/views/member/user/components/balance-list.vue new file mode 100644 index 00000000..437714a0 --- /dev/null +++ b/src/views/member/user/components/balance-list.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/member/user/components/card-title.vue b/src/views/member/user/components/card-title.vue new file mode 100644 index 00000000..4bd3ee93 --- /dev/null +++ b/src/views/member/user/components/card-title.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/member/user/components/growth-list.vue b/src/views/member/user/components/growth-list.vue new file mode 100644 index 00000000..5f356803 --- /dev/null +++ b/src/views/member/user/components/growth-list.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/member/user/components/point-list.vue b/src/views/member/user/components/point-list.vue new file mode 100644 index 00000000..7a454562 --- /dev/null +++ b/src/views/member/user/components/point-list.vue @@ -0,0 +1,153 @@ + + + diff --git a/src/views/member/user/components/sign-list.vue b/src/views/member/user/components/sign-list.vue new file mode 100644 index 00000000..ee57a951 --- /dev/null +++ b/src/views/member/user/components/sign-list.vue @@ -0,0 +1,136 @@ + + + diff --git a/src/views/member/user/detail/index.vue b/src/views/member/user/detail/index.vue new file mode 100644 index 00000000..219af98d --- /dev/null +++ b/src/views/member/user/detail/index.vue @@ -0,0 +1,217 @@ + + + +