From 4d9ae7321138221a50c9974d2f58bba6be7da09c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=AE=E6=A2=A6?= Date: Sat, 26 Aug 2023 13:24:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4icon=E7=9A=84=E5=AF=B9?= =?UTF-8?q?=E9=BD=90=E6=96=B9=E5=BC=8F=E4=B8=BA=E4=B8=AD=E9=97=B4=E5=B1=85?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Descriptions/src/DescriptionsItemLabel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Descriptions/src/DescriptionsItemLabel.vue b/src/components/Descriptions/src/DescriptionsItemLabel.vue index 35783351..ac4191f6 100644 --- a/src/components/Descriptions/src/DescriptionsItemLabel.vue +++ b/src/components/Descriptions/src/DescriptionsItemLabel.vue @@ -13,7 +13,7 @@ const { label } = defineProps({ From afaf7749c2d343c7aefef053672c9d4fcdaf524a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=AE=E6=A2=A6?= Date: Sat, 26 Aug 2023 13:45:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4icon=E7=9A=84=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Descriptions/src/DescriptionsItemLabel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Descriptions/src/DescriptionsItemLabel.vue b/src/components/Descriptions/src/DescriptionsItemLabel.vue index ac4191f6..1e1b9b03 100644 --- a/src/components/Descriptions/src/DescriptionsItemLabel.vue +++ b/src/components/Descriptions/src/DescriptionsItemLabel.vue @@ -13,7 +13,7 @@ const { label } = defineProps({ From 45a6b3bcc7461418c1d7822280948083f6f9b168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=AE=E6=A2=A6?= Date: Sat, 26 Aug 2023 13:48:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E5=A2=9E=E5=8A=A0=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E3=80=81=E6=88=90=E9=95=BF=E5=80=BC=E5=92=8C=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E3=80=82=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E9=85=8D=E5=A5=97=E7=9A=84svg=20=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E3=80=82=20=E5=A2=9E=E5=8A=A0tab=20=E7=9A=84=E6=87=92?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/member/user/index.ts | 3 ++ src/assets/svgs/member_balance.svg | 1 + .../svgs/member_expenditure_balance.svg | 1 + src/assets/svgs/member_level.svg | 1 + src/assets/svgs/member_point.svg | 1 + src/assets/svgs/member_recharge_balance.svg | 1 + .../member/user/detail/UserAccountInfo.vue | 51 ++++++++++--------- .../member/user/detail/UserBasicInfo.vue | 7 +-- src/views/member/user/detail/index.vue | 10 ++-- 9 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 src/assets/svgs/member_balance.svg create mode 100644 src/assets/svgs/member_expenditure_balance.svg create mode 100644 src/assets/svgs/member_level.svg create mode 100644 src/assets/svgs/member_point.svg create mode 100644 src/assets/svgs/member_recharge_balance.svg diff --git a/src/api/member/user/index.ts b/src/api/member/user/index.ts index 82d8d159..0a2e435d 100644 --- a/src/api/member/user/index.ts +++ b/src/api/member/user/index.ts @@ -16,6 +16,9 @@ export interface UserVO { status: number areaId: number | undefined areaName: string | undefined + levelName: string | null + point: number | undefined | null + experience: number | null | undefined } // 查询会员用户列表 diff --git a/src/assets/svgs/member_balance.svg b/src/assets/svgs/member_balance.svg new file mode 100644 index 00000000..5395b236 --- /dev/null +++ b/src/assets/svgs/member_balance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svgs/member_expenditure_balance.svg b/src/assets/svgs/member_expenditure_balance.svg new file mode 100644 index 00000000..02d498cd --- /dev/null +++ b/src/assets/svgs/member_expenditure_balance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svgs/member_level.svg b/src/assets/svgs/member_level.svg new file mode 100644 index 00000000..cbcc686d --- /dev/null +++ b/src/assets/svgs/member_level.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svgs/member_point.svg b/src/assets/svgs/member_point.svg new file mode 100644 index 00000000..b849ddb4 --- /dev/null +++ b/src/assets/svgs/member_point.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svgs/member_recharge_balance.svg b/src/assets/svgs/member_recharge_balance.svg new file mode 100644 index 00000000..7519bb23 --- /dev/null +++ b/src/assets/svgs/member_recharge_balance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/member/user/detail/UserAccountInfo.vue b/src/views/member/user/detail/UserAccountInfo.vue index 4eaa2bab..4be9dab5 100644 --- a/src/views/member/user/detail/UserAccountInfo.vue +++ b/src/views/member/user/detail/UserAccountInfo.vue @@ -1,51 +1,54 @@ +