From 935384c4e64f70e972825a20e0c7e4dccb732061 Mon Sep 17 00:00:00 2001 From: Megghy Date: Tue, 23 Apr 2024 12:19:25 +0800 Subject: [PATCH] point add guard limit --- .gitignore | 1 + env.d.ts | 4 +- index.html | 6 -- src/api/api-models.ts | 20 +++++- src/components/manage/PointGoodsItem.vue | 20 ++++-- src/data/constants.ts | 3 +- src/views/AboutView.vue | 6 ++ src/views/manage/point/PointManage.vue | 75 +++++++++++++++++++++- src/views/manage/point/PointUserManage.vue | 2 +- src/views/pointViews/PointGoodsView.vue | 54 ++++++++-------- 10 files changed, 148 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 694a590..9805cf2 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ pnpm-debug.log* *.njsproj *.sln *.sw? +env.d.ts diff --git a/env.d.ts b/env.d.ts index 0b5612e..06bac64 100644 --- a/env.d.ts +++ b/env.d.ts @@ -1,6 +1,8 @@ /// interface ImportMeta { env: { - VITE_DEBUG_API?: string + VITE_DEBUG_DEV_API?: string + VITE_DEBUG_RELEASE_API?: string + VITE_API?: string } } diff --git a/index.html b/index.html index 927ea28..7248f94 100644 --- a/index.html +++ b/index.html @@ -23,11 +23,5 @@
- - diff --git a/src/api/api-models.ts b/src/api/api-models.ts index c43dc7f..57502f7 100644 --- a/src/api/api-models.ts +++ b/src/api/api-models.ts @@ -15,6 +15,12 @@ export enum IndexTypes { export enum SongListTypes { Default, } +export enum GuardLevel { + None = 0, + Zongdu = 1, + Tidu = 2, + Jianzhang = 3, +} export interface UserBasicInfo { name: string id: number @@ -242,7 +248,7 @@ export enum QueueSortType { GuardFirst, PaymentFist, TimeFirst, - FansMedalFirst + FansMedalFirst, } export enum QueueGiftFilterType { @@ -604,6 +610,10 @@ export enum GoodsTypes { Physical, Virtual, } +export interface PointGoodsSetting { + guardFree?: { year: number; month: number } + allowGuardLevel?: GuardLevel +} export interface ResponsePointGoodModel { id: number name: string @@ -620,6 +630,10 @@ export interface ResponsePointGoodModel { maxBuyCount?: number collectUrl?: string embedCollectUrl?: boolean + + canFreeBuy: boolean + allowGuardLevel: GuardLevel + setting: PointGoodsSetting } export interface ImageUploadModel { existImages: string[] @@ -640,6 +654,8 @@ export interface PointGoodsModel { content?: string isAllowRebuy: boolean maxBuyCount?: number + + setting: PointGoodsSetting } export interface AddressInfo { id?: string @@ -727,7 +743,7 @@ export enum PointFrom { Use, } -export interface ResponseUserIndexModel{ +export interface ResponseUserIndexModel { notification: string videos: VideoCollectVideo[] links: { diff --git a/src/components/manage/PointGoodsItem.vue b/src/components/manage/PointGoodsItem.vue index 671a410..70f52ee 100644 --- a/src/components/manage/PointGoodsItem.vue +++ b/src/components/manage/PointGoodsItem.vue @@ -1,17 +1,19 @@