rogee/quyun-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 添加内容创建时间字段，优化内容列表和详情视图，更新价格获取逻辑

Browse Source
This commit is contained in:
Rogee
2026-01-05 19:22:04 +08:00
parent 454f6809b0
commit 1d53d9560e
4 changed files with 127 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/app/http/v1/dto/creator.go
View File

@@ -72,6 +72,7 @@ type CreatorContentItem struct {
VideoCount int `json:"video_count"` VideoCount int `json:"video_count"`
AudioCount int `json:"audio_count"` AudioCount int `json:"audio_count"`
Status string `json:"status"` Status string `json:"status"`
CreatedAt string `json:"created_at"`
IsPinned bool `json:"is_pinned"` IsPinned bool `json:"is_pinned"`
IsPurchased bool `json:"is_purchased"` IsPurchased bool `json:"is_purchased"`
} }

32
backend/app/services/content.go
View File

@@ -71,10 +71,24 @@ func (s *content) List(ctx context.Context, filter *content_dto.ContentListFilte
return nil, errorx.ErrDatabaseError.WithCause(err) return nil, errorx.ErrDatabaseError.WithCause(err)
} }
// Fetch Prices
priceMap := make(map[int64]float64)
if len(list) > 0 {
ids := make([]int64, len(list))
for i, item := range list {
ids[i] = item.ID
}
pTbl, pQ := models.ContentPriceQuery.QueryContext(ctx)
prices, _ := pQ.Where(pTbl.ContentID.In(ids...)).Find()
for _, p := range prices {
priceMap[p.ContentID] = float64(p.PriceAmount) / 100.0
}
}
// Convert to DTO // Convert to DTO
data := make([]content_dto.ContentItem, len(list)) data := make([]content_dto.ContentItem, len(list))
for i, item := range list { for i, item := range list {
data[i] = s.toContentItemDTO(item) data[i] = s.toContentItemDTO(item, priceMap[item.ID])
} }
return &requests.Pager{ return &requests.Pager{
@@ -110,6 +124,13 @@ func (s *content) Get(ctx context.Context, userID int64, id string) (*content_dt
return nil, errorx.ErrDatabaseError.WithCause(err) return nil, errorx.ErrDatabaseError.WithCause(err)
} }
// Fetch Price
var price float64
cp, err := models.ContentPriceQuery.WithContext(ctx).Where(models.ContentPriceQuery.ContentID.Eq(cid)).First()
if err == nil {
price = float64(cp.PriceAmount) / 100.0
}
// Interaction & Access status // Interaction & Access status
isLiked := false isLiked := false
isFavorited := false isFavorited := false
@@ -159,7 +180,7 @@ func (s *content) Get(ctx context.Context, userID int64, id string) (*content_dt
} }
detail := &content_dto.ContentDetail{ detail := &content_dto.ContentDetail{
ContentItem: s.toContentItemDTO(&item), ContentItem: s.toContentItemDTO(&item, price),
Description: item.Description, Description: item.Description,
Body: item.Body, Body: item.Body,
MediaUrls: s.toMediaURLs(accessibleAssets), MediaUrls: s.toMediaURLs(accessibleAssets),
@@ -335,7 +356,7 @@ func (s *content) GetLibrary(ctx context.Context, userID int64) ([]user_dto.Cont
var data []user_dto.ContentItem var data []user_dto.ContentItem
for _, item := range list { for _, item := range list {
dto := s.toContentItemDTO(item) dto := s.toContentItemDTO(item, 0)
dto.IsPurchased = true dto.IsPurchased = true
data = append(data, dto) data = append(data, dto)
} }
@@ -420,7 +441,7 @@ func (s *content) ListTopics(ctx context.Context) ([]content_dto.Topic, error) {
// Helpers // Helpers
func (s *content) toContentItemDTO(item *models.Content) content_dto.ContentItem { func (s *content) toContentItemDTO(item *models.Content, price float64) content_dto.ContentItem {
dto := content_dto.ContentItem{ dto := content_dto.ContentItem{
ID: cast.ToString(item.ID), ID: cast.ToString(item.ID),
Title: item.Title, Title: item.Title,
@@ -428,6 +449,7 @@ func (s *content) toContentItemDTO(item *models.Content) content_dto.ContentItem
AuthorID: cast.ToString(item.UserID), AuthorID: cast.ToString(item.UserID),
Views: int(item.Views), Views: int(item.Views),
Likes: int(item.Likes), Likes: int(item.Likes),
Price: price,
} }
if item.Author != nil { if item.Author != nil {
dto.AuthorName = item.Author.Nickname dto.AuthorName = item.Author.Nickname
@@ -600,7 +622,7 @@ func (s *content) getInteractList(ctx context.Context, userID int64, typ string)
var data []user_dto.ContentItem var data []user_dto.ContentItem
for _, item := range list { for _, item := range list {
data = append(data, s.toContentItemDTO(item)) data = append(data, s.toContentItemDTO(item, 0))
} }
return data, nil return data, nil
} }

16
backend/app/services/creator.go
View File

@@ -138,7 +138,7 @@ func (s *creator) ListContents(
} }
var list []*models.Content var list []*models.Content
err = q.Order(tbl.CreatedAt.Desc()). err = q.Order(tbl.ID.Desc()).
UnderlyingDB(). UnderlyingDB().
Preload("ContentAssets"). Preload("ContentAssets").
Preload("ContentAssets.Asset"). Preload("ContentAssets.Asset").
@@ -148,13 +148,14 @@ func (s *creator) ListContents(
} }
// Fetch Prices // Fetch Prices
ids := make([]int64, len(list))
for i, item := range list {
ids[i] = item.ID
}
priceMap := make(map[int64]float64) priceMap := make(map[int64]float64)
if len(ids) > 0 { if len(list) > 0 {
prices, _ := models.ContentPriceQuery.WithContext(ctx).Where(models.ContentPriceQuery.ContentID.In(ids...)).Find() ids := make([]int64, len(list))
for i, item := range list {
ids[i] = item.ID
}
pTbl, pQ := models.ContentPriceQuery.QueryContext(ctx)
prices, _ := pQ.Where(pTbl.ContentID.In(ids...)).Find()
for _, p := range prices { for _, p := range prices {
priceMap[p.ContentID] = float64(p.PriceAmount) / 100.0 priceMap[p.ContentID] = float64(p.PriceAmount) / 100.0
} }
@@ -207,6 +208,7 @@ func (s *creator) ListContents(
VideoCount: videoCount, VideoCount: videoCount,
AudioCount: audioCount, AudioCount: audioCount,
Status: string(item.Status), Status: string(item.Status),
CreatedAt: item.CreatedAt.Format("2006-01-02 15:04"),
IsPinned: item.IsPinned, IsPinned: item.IsPinned,
IsPurchased: false, IsPurchased: false,
}) })

157
frontend/portal/src/views/creator/ContentsView.vue
View File

@@ -61,73 +61,96 @@
<!-- Info --> <!-- Info -->
<div class="flex-1 min-w-0 flex flex-col justify-between"> <div class="flex-1 min-w-0 flex flex-col justify-between">
<div> <div>
<div class="flex items-center justify-between mb-2"> <div class="flex items-center justify-between mb-2">
<div class="flex items-center gap-2"> <div class="flex items-center gap-2 flex-1 min-w-0">
<span v-if="item.is_pinned" class="bg-red-600 text-white text-xs px-1.5 py-0.5 rounded font-bold">置顶</span> <span v-if="item.is_pinned"
<span class="text-xs px-1.5 py-0.5 border rounded text-slate-500" v-if="item.genre">[{{ getGenreLabel(item.genre) }}]</span> class="bg-red-600 text-white text-[10px] px-1.5 py-0.5 rounded font-bold whitespace-nowrap">置顶</span>
<span class="text-xs px-1.5 py-0.5 border rounded text-slate-500" v-if="item.key">[{{ item.key }}]</span> <span v-if="item.genre"
<h3 class="bg-slate-100 text-slate-600 text-[11px] px-2 py-0.5 rounded-full font-bold whitespace-nowrap">{{
class="font-bold text-slate-900 text-lg truncate hover:text-primary-600 cursor-pointer transition-colors" getGenreLabel(item.genre) }}</span>
@click="$router.push(`/creator/contents/${item.id}`)"> <span v-if="item.key"
{{ item.title }}</h3> class="bg-blue-50 text-blue-600 text-[11px] px-2 py-0.5 rounded-full font-bold whitespace-nowrap">{{
</div> item.key }}</span>
<!-- Status Badge --> <h3 class="font-bold text-slate-900 text-lg truncate hover:text-primary-600 cursor-pointer transition-colors"
<div class="flex items-center gap-2"> @click="$router.push(`/creator/contents/${item.id}`)">
<span v-if="item.status === 'blocked'" {{ item.title }}</h3>
class="text-red-500 text-xs flex items-center gap-1 cursor-help" title="已被封禁"> </div>
<i class="pi pi-info-circle"></i> 封禁 <!-- Status Badge -->
</span> <div class="flex items-center gap-2 ml-4">
<span class="px-2.5 py-1 rounded text-xs font-bold" <span v-if="item.status === 'blocked'" class="text-red-500 text-xs flex items-center gap-1 cursor-help"
:class="statusStyle(item.status).bg + ' ' + statusStyle(item.status).text"> title="已被封禁">
{{ statusStyle(item.status).label }} <i class="pi pi-info-circle"></i> 封禁
</span> </span>
</div> <span class="px-2.5 py-1 rounded text-xs font-bold whitespace-nowrap"
</div> :class="statusStyle(item.status).bg + ' ' + statusStyle(item.status).text">
{{ statusStyle(item.status).label }}
<div class="flex items-center gap-6 text-sm text-slate-500"> </span>
<span v-if="item.price > 0" class="text-red-600 font-bold">¥ {{ item.price.toFixed(2) }}</span> </div>
<span v-else class="text-green-600 font-bold">免费</span> </div>
<span class="flex items-center gap-1" title="图片" v-if="item.image_count > 0"> <div class="flex items-center gap-4 text-xs text-slate-500 mt-3">
<i class="pi pi-image"></i> {{ item.image_count }} <span class="flex items-center gap-1" title="发布时间">
</span> <i class="pi pi-calendar text-[10px]"></i> {{ item.created_at }}
<span class="flex items-center gap-1" title="视频" v-if="item.video_count > 0"> </span>
<i class="pi pi-video"></i> {{ item.video_count }}
</span> <div class="flex items-center gap-3 border-l border-slate-200 pl-3">
<span class="flex items-center gap-1" title="音频" v-if="item.audio_count > 0"> <span v-if="item.price > 0" class="text-red-600 font-bold">¥{{ item.price.toFixed(2) }}</span>
<i class="pi pi-microphone"></i> {{ item.audio_count }} <span v-else class="text-green-600 font-bold">免费</span>
</span> </div>
<span title="浏览量"><i class="pi pi-eye mr-1"></i> {{ item.views }}</span> <div class="flex items-center gap-3 border-l border-slate-200 pl-3">
<span title="点赞数"><i class="pi pi-thumbs-up mr-1"></i> {{ item.likes }}</span> <span class="flex items-center gap-1" title="图片" v-if="item.image_count > 0">
<!-- Date field missing in DTO, using hardcoded or omitting --> <i class="pi pi-image text-[10px]"></i> {{ item.image_count }}
</div> </span>
</div> <span class="flex items-center gap-1" title="视频" v-if="item.video_count > 0">
<i class="pi pi-video text-[10px]"></i> {{ item.video_count }}
<!-- Actions --> </span>
<div class="flex items-center gap-4 pt-3 border-t border-slate-50 mt-2"> <span class="flex items-center gap-1" title="音频" v-if="item.audio_count > 0">
<button class="text-sm text-slate-500 hover:text-primary-600 font-medium cursor-pointer" @click="$router.push(`/creator/contents/${item.id}`)"><i <i class="pi pi-microphone text-[10px]"></i> {{ item.audio_count }}
class="pi pi-file-edit mr-1"></i> 编辑</button> </span>
<button v-if="item.status === 'published'" </div>
class="text-sm text-slate-500 hover:text-orange-600 font-medium cursor-pointer"
@click="handleStatusChange(item.id, 'unpublished')"><i <div class="flex items-center gap-3 border-l border-slate-200 pl-3">
class="pi pi-arrow-down mr-1"></i> 下架</button> <span title="浏览量"><i class="pi pi-eye mr-1 text-[10px]"></i> {{ item.views }}</span>
<button v-if="item.status === 'unpublished'" <span title="点赞数"><i class="pi pi-thumbs-up mr-1 text-[10px]"></i> {{ item.likes }}</span>
class="text-sm text-slate-500 hover:text-green-600 font-medium cursor-pointer" </div>
@click="handleStatusChange(item.id, 'published')"><i </div>
class="pi pi-arrow-up mr-1"></i> 上架</button> </div>
<template v-if="item.status === 'published'">
<button v-if="!item.is_pinned" <!-- Actions -->
class="text-sm text-slate-500 hover:text-blue-600 font-medium cursor-pointer" <div class="flex items-center gap-4 pt-3 border-t border-slate-50 mt-3">
@click="handlePin(item.id, true)"><i <button class="text-sm text-slate-500 hover:text-primary-600 font-medium cursor-pointer flex items-center gap-1"
class="pi pi-bookmark mr-1"></i> 置顶</button> @click="$router.push(`/creator/contents/${item.id}`)">
<button v-else <i class="pi pi-file-edit"></i> 编辑
class="text-sm text-blue-600 font-medium cursor-pointer" </button>
@click="handlePin(item.id, false)"><i <button v-if="item.status === 'published'"
class="pi pi-bookmark-fill mr-1"></i> 取消置顶</button> class="text-sm text-slate-500 hover:text-orange-600 font-medium cursor-pointer flex items-center gap-1"
</template> <button class="text-sm text-slate-500 hover:text-red-600 font-medium ml-auto cursor-pointer" @click="handleDelete(item.id)"><i @click="handleStatusChange(item.id, 'unpublished')">
class="pi pi-trash mr-1"></i> 删除</button> <i class="pi pi-arrow-down"></i> 下架
</div> </button>
<button v-if="item.status === 'unpublished'"
class="text-sm text-slate-500 hover:text-green-600 font-medium cursor-pointer flex items-center gap-1"
@click="handleStatusChange(item.id, 'published')">
<i class="pi pi-arrow-up"></i> 上架
</button>
<template v-if="item.status === 'published'">
<button v-if="!item.is_pinned"
class="text-sm text-slate-500 hover:text-blue-600 font-medium cursor-pointer flex items-center gap-1"
@click="handlePin(item.id, true)">
<i class="pi pi-bookmark"></i> 置顶
</button>
<button v-else
class="text-sm text-blue-600 font-medium cursor-pointer flex items-center gap-1"
@click="handlePin(item.id, false)">
<i class="pi pi-bookmark-fill"></i> 取消置顶
</button>
</template>
<button
class="text-sm text-slate-400 hover:text-red-600 font-medium ml-auto cursor-pointer flex items-center gap-1 transition-colors"
@click="handleDelete(item.id)">
<i class="pi pi-trash"></i> 删除
</button>
</div>
</div> </div>
</div> </div>
</div> </div>