From 10d9f11fbaef14685b3860ed6fa1669b36637d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=AE=E6=A2=A6?= Date: Tue, 22 Aug 2023 16:14:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E4=BB=A5=E5=8F=8A=20=E7=AD=BE?= =?UTF-8?q?=E5=88=B0=E3=80=81=E7=A7=AF=E5=88=86=E7=AD=89=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=8B=E7=9A=84=E5=AD=90tab=E9=A1=B5?= =?UTF-8?q?=E3=80=82=20=E5=A2=9E=E5=8A=A0=20=E7=94=A8=E6=88=B7=E3=80=81?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E3=80=81=E7=A7=AF=E5=88=86=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=9A=84VO,=E6=96=B9=E4=BE=BF=E5=9C=A8=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E4=BD=BF=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/member/point/record/index.ts | 8 + src/api/member/signin/record/index.ts | 9 + src/api/member/user/index.ts | 18 +- .../member/user/components/account-info.vue | 43 ++++ .../member/user/components/address-list.vue | 13 ++ .../member/user/components/balance-list.vue | 13 ++ .../member/user/components/card-title.vue | 36 +++ .../member/user/components/growth-list.vue | 13 ++ .../member/user/components/point-list.vue | 156 +++++++++++++ .../member/user/components/sign-list.vue | 136 +++++++++++ src/views/member/user/detail/index.vue | 217 ++++++++++++++++++ 11 files changed, 661 insertions(+), 1 deletion(-) create mode 100644 src/views/member/user/components/account-info.vue create mode 100644 src/views/member/user/components/address-list.vue create mode 100644 src/views/member/user/components/balance-list.vue create mode 100644 src/views/member/user/components/card-title.vue create mode 100644 src/views/member/user/components/growth-list.vue create mode 100644 src/views/member/user/components/point-list.vue create mode 100644 src/views/member/user/components/sign-list.vue create mode 100644 src/views/member/user/detail/index.vue 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 94df2029..509bcc8d 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/views/member/user/components/account-info.vue b/src/views/member/user/components/account-info.vue new file mode 100644 index 00000000..50bf8e6a --- /dev/null +++ b/src/views/member/user/components/account-info.vue @@ -0,0 +1,43 @@ + + + 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..b4f1a30c --- /dev/null +++ b/src/views/member/user/components/point-list.vue @@ -0,0 +1,156 @@ + + + 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 @@ + + + + From c1a40e7c9825f8bdd2f3b6ac0eb028da16b5dbf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=AE=E6=A2=A6?= Date: Tue, 22 Aug 2023 16:28:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E7=A7=AF=E5=88=86tab=20=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E7=BB=84=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/member/user/components/point-list.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/views/member/user/components/point-list.vue b/src/views/member/user/components/point-list.vue index b4f1a30c..7a454562 100644 --- a/src/views/member/user/components/point-list.vue +++ b/src/views/member/user/components/point-list.vue @@ -94,9 +94,6 @@ @pagination="getList" /> - - -