更新

src/components/col-header/index.tsx

@@ -34,7 +34,7 @@ export default defineComponent({
     },
     color: {
       type: String,
-      default: '#323233'
+      default: '#131415'
     },
     rightText: String,
     onClickRight: {

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

@@ -955,7 +955,12 @@ export default defineComponent({
                         onDownloadApp()
                         return
                       }
-                      router.back()
+                      if(route.query.type ==='search') {
+                        router.push('train-tool')
+                      } else {
+                        router.back()
+                      }
+
                     }}
                   >
                     开通训练教程

src/tenant/music/search/header.tsx

@@ -476,7 +476,7 @@ export default defineComponent({
                           route.path === '/music-songbook/searchAlbum'
                             ? item.tenantAlbumId
                             : ''
-                        }`,
+                        }&type=search`,
                         () => {
                           router.push({
                             path: '/music-detail',
@@ -485,7 +485,8 @@ export default defineComponent({
                               tenantAlbumId:
                                 route.path === '/music-songbook/searchAlbum'
                                   ? item.tenantAlbumId
-                                  : ''
+                                  : '',
+                              type: 'search'
                             }
                           })
                         }

src/tenant/music/search/searchAlbum.tsx

@@ -116,13 +116,15 @@ export default defineComponent({
                     '#/music-detail?id=' +
                     item.id +
                     '&tenantAlbumId=' +
-                    item.tenantAlbumId
+                    item.tenantAlbumId +
+                    '&type=search'
                   openDefaultWebView(url, () => {
                     router.push({
                       path: '/music-detail',
                       query: {
                         id: item.id,
-                        tenantAlbumId: item.tenantAlbumId
+                        tenantAlbumId: item.tenantAlbumId,
+                        type: 'search'
                       }
                     })
                   })

src/tenant/music/train-list/index.module.less

@@ -68,7 +68,7 @@
   color: #F41E4B !important;
   font-size: 14px !important;
   background-color: #fff !important;
-  padding: 6px 21px 2px 8px !important;
+  padding: 2px 21px 0 8px !important;
   border-radius: 30px !important;
 
   &>div {
@@ -104,6 +104,7 @@
       font-weight: 600;
       color: #131415;
       line-height: 21px;
+      padding-bottom: 5px;
     }
 
     p {

src/tenant/music/train-list/index.tsx

@@ -1,4 +1,11 @@
-import { defineComponent, nextTick, onMounted, reactive, ref } from 'vue'
+import {
+  computed,
+  defineComponent,
+  nextTick,
+  onMounted,
+  reactive,
+  ref
+} from 'vue'
 import {
   List,
   DropdownMenu,
@@ -166,6 +173,21 @@ export default defineComponent({
       }
     }
 
+    const isSearchStatus = computed(() => {
+      const obj = searchObj.value
+      let status = false
+      if (obj.subjects && obj.subjects.length > 0) {
+        status = true
+      }
+      if (obj.levelList && obj.levelList.length > 0) {
+        status = true
+      }
+      if (obj.typeList && obj.typeList.length > 0) {
+        status = true
+      }
+      return status
+    })
+
     onMounted(async () => {
       // SUBJECT: '声部练习',
       // MUSIC: '独奏曲目',
@@ -274,6 +296,7 @@ export default defineComponent({
                   left: () => (
                     <DropdownMenu>
                       <DropdownItem
+                        disabled={!isSearchStatus.value}
                         titleClass={
                           params.subjectId || params.type || params.level
                             ? styles.titleActive