lex 1 year ago
parent
commit
6633241462
2 changed files with 16 additions and 7 deletions
  1. 3 3
      src/tenant/music/music-detail/new-index.tsx
  2. 13 4
      src/tenant/music/train-list/index.tsx

+ 3 - 3
src/tenant/music/music-detail/new-index.tsx

@@ -916,15 +916,15 @@ export default defineComponent({
                   >
                     立即练习
                   </Button>
-                ) : buyState.value.hasTenantAlbum || !buyState.value.play ? (
+                ) : buyState.value.hasTenantAlbum && !buyState.value.play ? (
                   <Button
                     round
                     block
                     type="primary"
-                    disabled
                     color="linear-gradient(270deg, #FF3C81 0%, #FF76A6 100%)"
+                    onClick={() => router.back()}
                   >
-                    立即练习
+                    开通训练教程
                   </Button>
                 ) : (
                   <div class={[styles.buyBtn]}>

+ 13 - 4
src/tenant/music/train-list/index.tsx

@@ -121,7 +121,8 @@ export default defineComponent({
         `${apiSuffix.value}/tenantAlbumMusic/selectCondition`,
         {
           data: {
-            subjectType: params.subjectType
+            subjectType: params.subjectType,
+            tenantAlbumId: params.albumId
           }
         }
       )
@@ -170,8 +171,8 @@ export default defineComponent({
       // MUSIC: '独奏曲目',
       // ENSEMBLE: '合奏练习'
       loading.value = true
-      await getSelectCondition()
       await getAlbumRecordPage()
+      await getSelectCondition()
       if (params.albumId) {
         await FetchList()
       } else {
@@ -214,14 +215,22 @@ export default defineComponent({
                                     styles.albumSearchCellActive
                                 ]}
                                 center
-                                onClick={() => {
+                                onClick={async () => {
                                   localStorage.setItem(
                                     'albumCatch' + subjectType,
                                     item.tenantAlbumId
                                   )
                                   params.albumId = item.tenantAlbumId
                                   params.albumName = item.tenantAlbumName
-                                  onSearch(params.keyword)
+                                  params.subjectId = null
+                                  params.level = ''
+                                  params.type = ''
+                                  await getSelectCondition()
+
+                                  params.page = 1
+                                  data.value = null
+                                  await FetchList()
+
                                   albumRef.value?.toggle()
                                 }}
                               >