Merge branch 'liu-v1.3'

src/views/music/search/index.tsx

@@ -27,8 +27,7 @@ export default defineComponent({
     const loading = ref(false)
     const keyword = ref(route.query.keyword || '')
     const tagids = ref(route.query.tagids || '')
-    const albumRows = ref([])
-    const sheetRows = ref([])
+    const subject = ref()
     const tagVisibility = ref(false)
     const words = useLocalStorage<string[]>('music-search', [])
     const activeTab = ref('songe')
@@ -78,15 +77,12 @@ export default defineComponent({
       tagVisibility.value = false
     }
 
-<<<<<<< HEAD
     const onConfirmSubject = (item: any) => {
       subject.value = item.id
       const activeRef = activeTab.value === 'album' ? albumList : musicList
       ;(activeRef.value as any).onComfirmSubject?.(item)
     }
 
-=======
->>>>>>> more_function
     const albumList = ref(null)
     const musicList = ref(null)
 
@@ -98,8 +94,7 @@ export default defineComponent({
       mitter.on('changeTab', changeTab)
       mitter.on('search', onSearch)
       mitter.on('confirm', onComfirm)
-      // ;(activeRef.value as any).onSearch?.('')
-      // console.log(searchInputRef.value)
+      mitter.on('confirmSubject', onConfirmSubject)
     })
 
     onUnmounted(() => {