From 67db925bfe45700f903a8c177f1f7d1f8a373f19 Mon Sep 17 00:00:00 2001
From: qier222 <68148142+qier222@users.noreply.github.com>
Date: Fri, 23 Oct 2020 20:11:19 +0800
Subject: [PATCH] fix: some bugs

---
 src/components/ButtonTwoTone.vue |  2 +-
 src/components/CoverRow.vue      | 15 +++++++++++----
 src/views/album.vue              | 20 ++++++++++++++++----
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/components/ButtonTwoTone.vue b/src/components/ButtonTwoTone.vue
index ccc2239..576116c 100644
--- a/src/components/ButtonTwoTone.vue
+++ b/src/components/ButtonTwoTone.vue
@@ -39,7 +39,7 @@ export default {
       return {
         borderRadius: this.shape === "round" ? "50%" : "8px",
         padding: `8px ${this.horizontalPadding}px`,
-        height: "38px",
+        // height: "38px",
         width: this.shape === "round" ? "38px" : "auto",
       };
     },
diff --git a/src/components/CoverRow.vue b/src/components/CoverRow.vue
index df5667b..66f7d1f 100644
--- a/src/components/CoverRow.vue
+++ b/src/components/CoverRow.vue
@@ -97,10 +97,17 @@ export default {
         return new Date(item.publishTime).getFullYear();
       if (this.subText === "artist")
         return `<a href="/#/artist/${item.artist.id}">${item.artist.name}</a>`;
-      if (this.subText === "albumType+releaseYear")
-        return `${item.size === 1 ? "Single" : "EP"} · ${new Date(
-          item.publishTime
-        ).getFullYear()}`;
+      if (this.subText === "albumType+releaseYear") {
+        let albumType = item.type;
+        if (item.type === "EP/Single") {
+          albumType = item.size === 1 ? "Single" : "EP";
+        } else if (item.type === "Single") {
+          albumType = "Single";
+        } else if (item.type === "专辑") {
+          albumType = "Album";
+        }
+        return `${albumType} · ${new Date(item.publishTime).getFullYear()}`;
+      }
       if (this.subText === "appleMusic") return "by Apple Music";
     },
   },
diff --git a/src/views/album.vue b/src/views/album.vue
index d23cccb..4c9f472 100644
--- a/src/views/album.vue
+++ b/src/views/album.vue
@@ -56,7 +56,12 @@
       </div>
     </div>
     <div class="more-by" v-if="filteredMoreAlbums.length !== 0">
-      <div class="section-title"> More by {{ album.artist.name }} </div>
+      <div class="section-title">
+        More by
+        <router-link :to="`/artist/${album.artist.id}`"
+          >{{ album.artist.name }}
+        </router-link></div
+      >
       <div>
         <CoverRow
           type="album"
@@ -134,8 +139,15 @@ export default {
     filteredMoreAlbums() {
       let moreAlbums = this.moreAlbums.filter((a) => a.id !== this.album.id);
       let realAlbums = moreAlbums.filter((a) => a.type === "专辑");
-      let restItems = moreAlbums.filter((a) => a.type !== "专辑");
-      return [...realAlbums, ...restItems].slice(0, 5);
+      let eps = moreAlbums.filter(
+        (a) => a.type === "EP" || (a.type === "EP/Single" && a.size > 1)
+      );
+      let restItems = moreAlbums.filter(
+        (a) =>
+          realAlbums.find((a1) => a1.id === a.id) === undefined &&
+          eps.find((a1) => a1.id === a.id) === undefined
+      );
+      return [...realAlbums, ...eps, ...restItems].slice(0, 5);
     },
   },
   methods: {
@@ -161,7 +173,7 @@ export default {
         });
 
         // get more album by this artist
-        getArtistAlbum({ id: this.album.artist.id, limit: 200 }).then(
+        getArtistAlbum({ id: this.album.artist.id, limit: 100 }).then(
           (data) => {
             this.moreAlbums = data.hotAlbums;
           }