Merge branch 'iteration-20240826' of http://git.dayaedu.com/liushengqiang/classroom-app into hqyDev

src/views/co-ai/index.module.less

@@ -472,7 +472,7 @@
       border-radius: 3px;
       border: 1px solid #FFC5C5;
       line-height: 1;
-      margin-right: 2px;
+      margin-right: 0px;
       transform: scale(0.85);
 
       .iconFire {
@@ -489,7 +489,7 @@
       background: #FFFFFF;
       border-radius: 3px;
       line-height: 1;
-      margin-right: 3px;
+      margin-right: 0px;
       transform: scale(0.85);
     }
 
@@ -508,6 +508,7 @@
       font-size: 12px;
       font-weight: 400;
       color: #777;
+      padding-left: 2px;
       line-height: 12px;
       max-width: 9vw;
     }

src/views/co-ai/index.tsx

@@ -496,9 +496,9 @@ export default defineComponent({
       const codeMapKeys: string[] = [];
       subjectList.forEach((data: any) => {
         if (data.enableFlag) {
-          const codes = data.code.split(/[,，]/);
+          const codes = data.code?.split(/[,，]/);
           codes.forEach((code: string) => {
-            let codeTemp = code?.replaceAll(' ', '').toLowerCase();
+            let codeTemp = code?.replace(/ /g, '').toLowerCase();
             codeMapKeys.push(codeTemp);
             if (codeIdMap.has(codeTemp)) {
               codeIdMap.get(codeTemp).push(data.id + '');
@@ -514,7 +514,7 @@ export default defineComponent({
       if (!code) {
         return '';
       }
-      code = code?.replaceAll(' ', '').toLowerCase();
+      code = code && code?.replace(/ /g, '').toLowerCase();
       const tempCode = getInstrumentNameCode(codeMapKeys, code);
       if (codeIdMap.has(tempCode)) {
         const result = codeIdMap.get(tempCode);
@@ -782,9 +782,9 @@ export default defineComponent({
                     onSearch={async val => {
                       if (!data.loading) {
                         musicForms.keyword = val;
+                        data.musicIndex = 0
                         await handleReset();
                         await analyzeXml();
-
                         musicIframeLoad();
                       }
                     }}>

src/views/download/index.module.less

@@ -15,7 +15,7 @@
 
 .buttonGroup {
   text-align: center;
-  margin: 15px 0 15px -8px;
+  margin: 15px 0 15px;
 }
 
 .btn {