Merge branch 'iteration-20240607-small' into jenkins-test

src/views/hot-music-more/index.tsx

@@ -84,7 +84,7 @@ const ChildNodeSearch = defineComponent({
                     } else {
                       selectItem.value = {};
                     }
-                    emit('selectChildTag', subject);
+                    emit('selectChildTag', activeRow.value.activeIndex);
                   }}>
                   {subject.name}
                 </div>
@@ -94,7 +94,7 @@ const ChildNodeSearch = defineComponent({
             <ChildNodeSearch
               activeRow={selectItem.value}
               onSelectChildTag={(item: any) => {
-                emit('selectChildTag', item);
+                emit('selectChildTag', item || activeRow.value.activeIndex);
               }}
             />
           </>
@@ -255,7 +255,6 @@ export default defineComponent({
     const getMusicTagTree = async () => {
       try {
         const res = await request.get('/edu-app/musicTag/tree');
-        console.log(res.data);
         const result = res.data || [];
         data.tags = [
           {
@@ -496,7 +495,7 @@ export default defineComponent({
                   <ChildNodeSearch
                     activeRow={data.selectParents}
                     onSelectChildTag={(val: any) => {
-                      data.childSelectId = val.id;
+                      data.childSelectId = val;
                       // onSearch();
                       console.log(data.childSelectId);
                     }}