Merge branch 'share-member' into dev

src/teacher/my-sheetMusic/index.tsx

@@ -6,6 +6,7 @@ import { getRandomKey } from '@/views/music/music'
 import Personal from '@/views/music/personal/personal'
 import Collection from '@/views/music/personal/collection'
 import Album from '@/views/music/personal/album'
+import AlbumMy from '@/views/music/personal/album-my'
 
 export default defineComponent({
   name: 'mySheetMusic',
@@ -39,6 +40,11 @@ export default defineComponent({
                 />
               </div>
             </Tab>
+            <Tab title="购买专辑" name="personal-album">
+              <div class={styles.container}>
+                <AlbumMy />
+              </div>
+            </Tab>
             <Tab title="收藏单曲" name="collection">
               <div class={styles.container}>
                 <Collection

src/views/music/album-detail/index.tsx

@@ -223,11 +223,8 @@ export default defineComponent({
           <div class={styles.bg}>
             <div class={styles.alumWrap}>
               <div class={styles.img}>
-                {albumDetail.value?.paymentType && (
-                  <span class={styles.albumType}>
-                    {albumDetail.value?.paymentType === 'FREE' && '免费'}
-                    {albumDetail.value?.paymentType === 'CHARGE' && '付费'}
-                  </span>
+                {albumDetail.value?.paymentType === 'CHARGE' && (
+                  <span class={styles.albumType}>付费</span>
                 )}
                 <Image
                   class={styles.image}

src/views/music/album/item.tsx

@@ -20,11 +20,8 @@ export default defineComponent({
         onClick={() => router.push('/music-album-detail/' + data.id)}
       >
         <Image class={styles.img} src={data.albumCoverUrl} />
-        {data.paymentType && (
-          <span class={styles.albumType}>
-            {data.paymentType === 'FREE' && '免费'}
-            {data.paymentType === 'CHARGE' && '付费'}
-          </span>
+        {data.paymentType === 'CHARGE' && (
+          <span class={styles.albumType}>付费</span>
         )}
 
         <div class={styles.content}>

src/views/music/component/music-grid/index.module.less

@@ -36,6 +36,19 @@
     border-radius: 6px;
     overflow: hidden;
     margin-bottom: 6px;
+    .albumType {
+      position: absolute;
+      left: 0;
+      top: 0;
+      background: linear-gradient(180deg, #ff8900 0%, #ff5100 100%);
+      box-shadow: 0px 1px 2px 0px rgba(150, 13, 0, 0.11);
+      border-radius: 10px 0px 10px 0px;
+      font-size: 12px;
+      padding: 0 6px;
+      line-height: 20px;
+      color: #ffffff;
+      z-index: 9;
+    }
     .model {
       position: absolute;
       left: 4px;

src/views/music/component/music-grid/index.tsx

@@ -20,6 +20,9 @@ export default defineComponent({
             <GridItem>
               <div class={styles.item} onClick={() => emit('goto', n)}>
                 <div class={styles.imgWrap}>
+                  {n.paymentType === 'CHARGE' && (
+                    <span class={styles.albumType}>付费</span>
+                  )}
                   <Image
                     class={styles.image}
                     width="100%"

src/views/music/songbook/album.tsx

@@ -57,11 +57,8 @@ export default defineComponent({
                   onClick={() => router.push('/music-album-detail/' + item.id)}
                 >
                   <div class={styles.main}>
-                    {item.paymentType && (
-                      <span class={styles.albumType}>
-                        {item.paymentType === 'FREE' && '免费'}
-                        {item.paymentType === 'CHARGE' && '付费'}
-                      </span>
+                    {item.paymentType === 'CHARGE' && (
+                      <span class={styles.albumType}>付费</span>
                     )}
                     <Image class={styles.img} src={item.albumCoverUrl} />
                     <p class={styles.favorite}>