From fbda489db7200250eee972cb460debe7dde24389 Mon Sep 17 00:00:00 2001 From: Megghy Date: Fri, 2 Feb 2024 23:38:22 +0800 Subject: [PATCH] fix avatar property (to uface --- src/api/api-models.ts | 40 ++++++++- src/data/DanmakuClient.ts | 8 +- src/router/manage.ts | 2 +- src/views/manage/{ => point}/PointManage.vue | 0 .../manage/{ => point}/PointOrderManage.vue | 12 ++- .../manage/point/PointUserDetailCard.vue | 56 ++++++++++++ src/views/manage/point/PointUserManage.vue | 86 +++++++++++++++++++ 7 files changed, 194 insertions(+), 10 deletions(-) rename src/views/manage/{ => point}/PointManage.vue (100%) rename src/views/manage/{ => point}/PointOrderManage.vue (71%) create mode 100644 src/views/manage/point/PointUserDetailCard.vue create mode 100644 src/views/manage/point/PointUserManage.vue diff --git a/src/api/api-models.ts b/src/api/api-models.ts index feb8ebb..5899205 100644 --- a/src/api/api-models.ts +++ b/src/api/api-models.ts @@ -425,7 +425,7 @@ export enum QueueStatus { export interface EventModel { type: EventDataTypes name: string - avatar: string + uface: string uid: number msg: string time: number @@ -557,13 +557,47 @@ export interface AddressInfo { phone: number name: string } -export interface BiliAuthModel { +export interface BiliAuthBaseModel { id: number userId: number openId: string + avatar: string + name: string +} +export interface BiliAuthModel extends BiliAuthBaseModel { address?: AddressInfo } export interface PointOrderModel{ id: number - + +} +export interface ResponsePointUserModel{ + point: number + orderCount: number + isAuthed: boolean + info?: BiliAuthBaseModel +} + +export interface ResponsePointOrder2StreamerModel { + id: number + customer: BiliAuthModel + address?: AddressInfo + goodsId: number + createAt: number + status: PointOrderStatus +} + +export interface ResponsePointOrder2UserModel { + id: number + address?: AddressInfo + goodsId: PointGoodsModel + status: PointOrderStatus + createAt: number +} +export enum PointOrderStatus { + Pending, // 订单正在等待处理 + Shipped, // 订单已发货 + Canceled, // 订单已取消 + Refunded, // 订单已退款 + Failed, // 订单处理失败 } diff --git a/src/data/DanmakuClient.ts b/src/data/DanmakuClient.ts index 3403059..85a0380 100644 --- a/src/data/DanmakuClient.ts +++ b/src/data/DanmakuClient.ts @@ -266,7 +266,7 @@ export default class DanmakuClient { fans_medal_name: data.fans_medal_name, fans_medal_wearing_status: data.fans_medal_wearing_status, emoji: data.dm_type == 1 ? data.emoji_img_url : undefined, - avatar: data.uface, + uface: data.uface, }, command, ) @@ -292,7 +292,7 @@ export default class DanmakuClient { fans_medal_level: data.fans_medal_level, fans_medal_name: data.fans_medal_name, fans_medal_wearing_status: data.fans_medal_wearing_status, - avatar: data.uface, + uface: data.uface, }, command, ) @@ -317,7 +317,7 @@ export default class DanmakuClient { fans_medal_level: data.fans_medal_level, fans_medal_name: data.fans_medal_name, fans_medal_wearing_status: data.fans_medal_wearing_status, - avatar: data.uface, + uface: data.uface, }, command, ) @@ -342,7 +342,7 @@ export default class DanmakuClient { fans_medal_level: data.fans_medal_level, fans_medal_name: data.fans_medal_name, fans_medal_wearing_status: data.fans_medal_wearing_status, - avatar: data.user_info.uface, + uface: data.user_info.uface, }, command, ) diff --git a/src/router/manage.ts b/src/router/manage.ts index 69cc80f..57e9612 100644 --- a/src/router/manage.ts +++ b/src/router/manage.ts @@ -162,7 +162,7 @@ export default //管理页面 { path: 'point', name: 'manage-point', - component: () => import('@/views/manage/PointManage.vue'), + component: () => import('@/views/manage/point/PointManage.vue'), meta: { title: '积分', }, diff --git a/src/views/manage/PointManage.vue b/src/views/manage/point/PointManage.vue similarity index 100% rename from src/views/manage/PointManage.vue rename to src/views/manage/point/PointManage.vue diff --git a/src/views/manage/PointOrderManage.vue b/src/views/manage/point/PointOrderManage.vue similarity index 71% rename from src/views/manage/PointOrderManage.vue rename to src/views/manage/point/PointOrderManage.vue index 439215f..0aa48a1 100644 --- a/src/views/manage/PointOrderManage.vue +++ b/src/views/manage/point/PointOrderManage.vue @@ -2,7 +2,7 @@ import { PointOrderModel } from '@/api/api-models' import { QueryGetAPI } from '@/api/query' import { POINT_API_URL } from '@/data/constants' -import { useMessage } from 'naive-ui' +import { NCard, NList, NListItem, useMessage } from 'naive-ui' import { ref } from 'vue' const message = useMessage() @@ -25,4 +25,12 @@ async function getOrders() { } - + diff --git a/src/views/manage/point/PointUserDetailCard.vue b/src/views/manage/point/PointUserDetailCard.vue new file mode 100644 index 0000000..e88a964 --- /dev/null +++ b/src/views/manage/point/PointUserDetailCard.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/views/manage/point/PointUserManage.vue b/src/views/manage/point/PointUserManage.vue new file mode 100644 index 0000000..f65afe0 --- /dev/null +++ b/src/views/manage/point/PointUserManage.vue @@ -0,0 +1,86 @@ + + +