lex-xin 10 kuukautta sitten
vanhempi
commit
ae04cb423e

+ 7 - 9
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>

+ 1 - 1
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;
 

+ 8 - 9
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;