Merge branch 'iteration-20240909' into jenkins-test

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

@@ -527,6 +527,8 @@
   border: none;
   width: 63%;
   border-radius: 18px;
+  display: flex;
+  flex-direction: column;
 }
 
 .right-musicName {
@@ -543,6 +545,7 @@
 }
 
 .rightBox {
+  flex: 1;
   width: 100%;
   height: 100%;
   border-radius: 18px;
@@ -598,10 +601,10 @@
 }
 
 .rightBtns {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
+  // position: absolute;
+  // bottom: 0;
+  // left: 0;
+  // right: 0;
   padding: 0 18px 18px 18px;
   display: flex;
   align-items: flex-end;

src/views/co-ai/index.tsx

@@ -277,7 +277,7 @@ export default defineComponent({
           ...musicForms,
           audioPlayTypes: data.audioPlayTypeItem.value
             ? data.audioPlayTypeItem.value === 'PLAY_SING'
-              ? ['PLAY', 'SING']
+            ? ['PLAY', 'SING']
               : [data.audioPlayTypeItem.value]
             : []
           // musicalInstrumentId: data.subjectItem.value || null
@@ -890,20 +890,18 @@ export default defineComponent({
                             <img src={iconFire} class={styles.iconFire} />
                             {formatUsedNum(item.usedNum)}
                           </span>
-                          {item.audioPlayTypes?.includes('PLAY') && (
-                            <span
-                              class={[styles.iconPlayType, styles.iconPlay]}>
-                              演奏
-                            </span>
-                          )}
-
                           {item.audioPlayTypes?.includes('SING') && (
                             <span
                               class={[styles.iconPlayType, styles.iconSing]}>
                               演唱
                             </span>
                           )}
-
+                          {item.audioPlayTypes?.includes('PLAY') && (
+                            <span
+                              class={[styles.iconPlayType, styles.iconPlay]}>
+                              演奏
+                            </span>
+                          )}
                           <div class={[styles.musicAuthor, 'van-ellipsis']}>
                             {item.composer || '佚名'}
                           </div>

src/views/courseware-play/component/musicScore.module.less

@@ -38,7 +38,7 @@
 
 .startBtn {
   position: absolute;
-  left: 1%;
+  left: 4.6%;
   bottom: 1.93333rem;
   z-index: 11;
 

src/views/hot-music-more/index.module.less

@@ -162,15 +162,14 @@
       border-radius: 3px;
       border: 0.6px solid #FFC5C5;
       line-height: 1;
-      margin-right: 2px;
+      margin-right: 1px;
       transform: scale(0.85);
 
       .iconFire {
         display: inline-block;
         width: 8px;
         height: 10px;
-        margin-right: 3px;
-        transform: scale(0.9);
+        margin-right: 1px;
       }
     }
 
@@ -180,7 +179,7 @@
       background: #FFFFFF;
       border-radius: 3px;
       line-height: 1;
-      margin-right: 3px;
+      margin-right: 1px;
       transform: scale(0.85);
     }
 

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

@@ -412,7 +412,7 @@ export default defineComponent({
                     state.sBookId = musicForms.bookVersionId;
                     state.sAPT =
                       musicForms.audioPlayTypes.length > 1
-                        ? 'PLAY_SING'
+                        ? 'SING_PLAY'
                         : musicForms.audioPlayTypes.join('');
                     state.searchPopup = true;
                   }}>
@@ -459,19 +459,18 @@ export default defineComponent({
                             <img src={iconFire} class={styles.iconFire} />
                             {formatUsedNum(item.usedNum)}
                           </span>
-                          {item.audioPlayTypes?.includes('PLAY') && (
-                            <span
-                              class={[styles.iconPlayType, styles.iconPlay]}>
-                              演奏
-                            </span>
-                          )}
-
                           {item.audioPlayTypes?.includes('SING') && (
                             <span
                               class={[styles.iconPlayType, styles.iconSing]}>
                               演唱
                             </span>
                           )}
+                          {item.audioPlayTypes?.includes('PLAY') && (
+                            <span
+                              class={[styles.iconPlayType, styles.iconPlay]}>
+                              演奏
+                            </span>
+                          )}
 
                           {item.composer && <p>{item.composer}</p>}
                         </div>
@@ -513,7 +512,7 @@ export default defineComponent({
                   // musicForms.grade = state.sGrade;
                   musicForms.audioPlayTypes = state.sAPT
                     ? state.sAPT === 'PLAY_SING'
-                      ? ['PLAY', 'SING']
+                      ? ['SING', 'PLAY']
                       : [state.sAPT]
                     : [];
                   state.searchPopup = false;