Merge branch 'newVersion'

src/components/searchInput/index.tsx

@@ -57,13 +57,14 @@ export default defineComponent({
       }
     )
     const getSubjectList = async () => {
+      console.log('调用')
       try {
         const res = await request.get(
-          '/api-website/open/subject/subjectSelect',
-          {}
+          '/api-website/open/subject/queryPage',
+          {data:{rows:9999,page:1}}
         )
 
-        state.subjectList = res.data
+        state.subjectList = res.data.rows
       } catch (e) {
         console.log(e)
       }

src/views/home/index.tsx

@@ -127,7 +127,7 @@ export default defineComponent({
                     <img
                       src={searchIcon}
                       class={styles.searchIcon}
-
+                      onClick={()=>gotoSearch(state.search,'music')}
                       alt=""
                     />
                     <ElInput

src/views/musicLibrary/index.module.less

@@ -63,7 +63,7 @@
     margin-top: 17px;
   }
   .hotAlbum {
-    margin-top: 37px;
+    margin-top: 25px;
     font-size: 22px;
     font-weight: 500;
     color: #333;

src/views/musicLibrary/index.tsx

@@ -2,7 +2,7 @@
 import { defineComponent, toRefs, reactive, onMounted, ref } from 'vue'
 import arrow from '@/components/musicLIstItem/images/arrow.png'
 import styles from './index.module.less'
-import albumItem from '@/components/albumItem'
+import albumItem from './modals/albumItem'
 import videoDetailItem from '@/components/videoDetailItem'
 import musicLIstItem from '@/components/musicLIstItem'
 import hotSearch from '@/components/hotSearch'