From 90a058974154fce4d7f6be8d9bedb45c31e5a2a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BB=93=E5=8F=91=E5=8F=97=E9=95=BF=E7=94=9F?=
 <colorfulsweet@icloud.com>
Date: Wed, 9 Feb 2022 02:14:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9F=B3=E4=B9=90=E5=B0=81=E9=9D=A2=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/model/api/music.ts        |  8 ++++----
 src/model/api/source-image.ts |  8 --------
 src/views/api/Music.vue       | 12 ++++++++----
 src/views/api/SourceImage.vue |  6 +++---
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/model/api/music.ts b/src/model/api/music.ts
index 3c79dcb..46a4cb4 100644
--- a/src/model/api/music.ts
+++ b/src/model/api/music.ts
@@ -26,11 +26,11 @@ export interface MusicLyricModel {
 }
 
 export interface MusicPlayerItem {
-  id: number
+  id?: number
   name: string
-  artist: string
-  album: string
+  artist: string | undefined
+  album: string | undefined
   url: string
   cover: string
-  lrc: string | undefined
+  lrc?: string
 }
\ No newline at end of file
diff --git a/src/model/api/source-image.ts b/src/model/api/source-image.ts
index aea6477..9c7a9bf 100644
--- a/src/model/api/source-image.ts
+++ b/src/model/api/source-image.ts
@@ -7,11 +7,3 @@ export interface SourceImageModel {
   img: ArrayBuffer // 图片二进制数据
   created_at: Date
 }
-
-/**
- * 图片标签
- */
-export interface ImageLabel {
-  name: string // 标签名称
-  color: string // 标签颜色
-}
\ No newline at end of file
diff --git a/src/views/api/Music.vue b/src/views/api/Music.vue
index e204865..d46d2d3 100644
--- a/src/views/api/Music.vue
+++ b/src/views/api/Music.vue
@@ -212,13 +212,17 @@ export default class Music extends BaseList<MusicPage> {
     try {
       const data = await this.$http.get<any, any>('/api/v1/music/list/all', {params: selectedIds.length ? {ids: selectedIds} : this.search})
       this.musicList = data.map((item: MusicModel) => {
-        return {
+        const musicItem: MusicPlayerItem = {
           name: item.title || item.name,
           artist: item.artist,
-          url: `/api/v2/getMusic/${item._id}`,
-          cover: `/api/v1/common/music/album/${item._id}`,
-          lrc: item.lyric_id ? `/api/v1/common/music/lyric/${item.lyric_id}` : undefined
+          album: item.album,
+          url: `/api/v2/common/music/load/${item._id}`,
+          cover: `/api/v2/common/music/album/${item._id}`,
         }
+        if(item.lyric_id) {
+          musicItem.lrc = `/api/v1/common/music/lyric/${item.lyric_id}`
+        }
+        return musicItem
       })
       // 删除原本可能存在的播放器配置(包含播放地址 时间进度等信息)
       this.musicPlaying = true
diff --git a/src/views/api/SourceImage.vue b/src/views/api/SourceImage.vue
index 63adaab..4268983 100644
--- a/src/views/api/SourceImage.vue
+++ b/src/views/api/SourceImage.vue
@@ -79,7 +79,7 @@ import { ElButton, ElTable, ElTableColumn, ElPagination, ElAlert, ElUpload, ElTa
 import prettyBytes from 'pretty-bytes'
 import { MsgResult, Page } from '../../model/common.dto'
 import BaseList from '../../model/baselist'
-import { SourceImageModel, ImageLabel } from '../../model/api/source-image'
+import { SourceImageModel } from '../../model/api/source-image'
 import { h } from 'vue'
 
 let selectedData: string[] = []
@@ -93,7 +93,7 @@ export default class SourceImage extends BaseList<Page> {
   allowUploadExt = ['jpg','jpeg','png','svg','ico']
   sourceImageData: SourceImageModel[] = []
   curModifyLabels: string[] = []
-  labelList: ImageLabel[] = []
+  labelList: string[] = []
   curId: string | null = null
   modifyModal: boolean = false
   isUploading: boolean = false
@@ -102,7 +102,7 @@ export default class SourceImage extends BaseList<Page> {
   }
   get labels() {
     return this.labelList.map(item => {
-      return { key: item.name, label: item.name }
+      return { key: item, label: item }
     })
   }
   async loadData(): Promise<void> {