Merge branches 'next' and 'next' of github.com:Linkontoask/radishes i…

…nto next
radishes-music · Dec 12, 2020 · a9a22f9 · a9a22f9
2 parents e6653d1 + 41bcce3
commit a9a22f9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/pages/artist/children/detail.tsx b/src/pages/artist/children/detail.tsx
@@ -13,12 +13,16 @@ export const Desc = defineComponent({
 
     return () => (
       <div class="artist-desc">
-        <h2>{state.artist.name}简介</h2>
+        <h2 v-show={!!state.briefDesc}>{state.artist.name}简介</h2>
         <div>{state.briefDesc}</div>
         {state.introduction.map(item => (
           <>
             <h2>{item.ti}</h2>
-            <div v-html={item.txt.replace(/(.+)\n/g, '<div>$1</div>')}></div>
+            <div
+              v-html={item.txt.replace(/(.+\n)|(.+$)/g, (ment: string) => {
+                return `<div>${ment}</div>`
+              })}
+            ></div>
           </>
         ))}
       </div>

diff --git a/src/pages/list/view/index.tsx b/src/pages/list/view/index.tsx
@@ -15,10 +15,16 @@ import {
   FooterMutations
 } from '@/pages/footer/module'
 import { getSongUrl } from '@/api/index'
-import { SongsBase, FormatSource } from '@/interface'
+import { SongsBase, FormatSource, SongsDetail } from '@/interface'
 import { SecondaryList } from '@/components/secondary-list'
 import './index.less'
 
+const isCopyright = (song: SongsDetail) => {
+  // Currently does not clear which values are used to determine whether there is copyright
+  // return song.fee === 0 && song.no === 1
+  return true
+}
+
 const formatPlayListData = (item: SongState['playlist']): FormatSource => {
   return {
     id: item.id,
@@ -38,7 +44,7 @@ const formatPlayListData = (item: SongState['playlist']): FormatSource => {
     list: [
       ...item.tracks.map(o => ({
         ...o,
-        noCopyright: !(o.fee === 8 && o.no === 2)
+        noCopyright: !isCopyright(o)
       }))
     ]
   }
@@ -62,7 +68,7 @@ const formatAlbumListData = (item: SongState['albumList']): FormatSource => {
     list: [
       ...item.song.map(o => ({
         ...o,
-        noCopyright: !(o.fee === 8 && o.no === 2)
+        noCopyright: !isCopyright(o)
       }))
     ]
   }

diff --git a/src/router/index.ts b/src/router/index.ts
@@ -149,7 +149,7 @@ export const navRouter: RouteRecordRaw[] = [
         component: SongList,
         name: 'songlist',
         meta: {
-          name: '歌单',
+          name: '精品歌单',
           path: {
             name: 'songlist',
             query: {