lex 1 year ago
parent
commit
e2c448a66e

+ 7 - 1
src/tenant/music/search/header.tsx

@@ -470,7 +470,13 @@ export default defineComponent({
                       )
                     } else {
                       openWebViewOrWeb(
-                        `${location.origin}/tenant/#/music-detail?id=${item.id}`,
+                        `${location.origin}/tenant/#/music-detail?id=${
+                          item.id
+                        }&tenantAlbumId=${
+                          route.path === '/music-songbook/searchAlbum'
+                            ? item.tenantAlbumId
+                            : ''
+                        }`,
                         () => {
                           router.push({
                             path: '/music-detail',

BIN
src/tenant/music/train-tool/images/music-bg.png


+ 5 - 2
src/views/music/music-detail/index.tsx

@@ -529,6 +529,7 @@ export default defineComponent({
     const buyState = computed(() => {
       const music = musicDetail.value
       return {
+        hasTenantAlbum: route.query?.tenantAlbumId ? true : false, // 是否从专辑来的
         play: music.play ? true : false, // 是否可以播放
         free: music?.paymentType.includes('FREE'),
         charge: music?.paymentType.includes('CHARGE'),
@@ -985,8 +986,10 @@ export default defineComponent({
           {musicDetail.value?.id && (
             <ColSticky position="bottom" background="white">
               <div ref={footers}>
-                {/* 判断是否是免费的,或者已经购买过 */}
-                {buyState.value.play ? (
+                {/* 判断是否是免费的,或者已经购买过,是否从专辑过来的 */}
+                {buyState.value.play ||
+                (state.platformType === 'TEACHER' &&
+                  buyState.value.hasTenantAlbum) ? (
                   <Button
                     round
                     block