Merge remote-tracking branch 'origin/hqyDev' into feature-tianyong

src/helpers/metronome.ts

@@ -217,6 +217,8 @@ class Metronome {
 
 	// 播放
 	playAudio = () => {
+		// 关闭定时器节拍器
+		return
 		/* 如果是 评测模式且不为MIDI并且节拍器资源加载成功的时候  不运行节拍器播放*/
 		if (state.modeType === "practise" && state.playMode !== "MIDI") {
 			if(state.playType === "play" && state.playSource === "music" && audioDataState.songCollection.beatSongEle){

src/page-instrument/header-top/index.tsx

@@ -671,7 +671,7 @@ export default defineComponent({
           {!(state.playState == "play" || followData.start || evaluatingData.startBegin) && !state.isWeb &&  (
             <div id="noticeBarRollDom" class={styles.headTopLeftBox}>
               {
-                !query.isMove && <img src={iconBack} class={["headTopBackBtn", styles.img, !headTopData.showBack && styles.hidenBack]} onClick={handleBack} />
+                !query.isMove && !query.isHideBack && <img src={iconBack} class={["headTopBackBtn", styles.img, !headTopData.showBack && styles.hidenBack]} onClick={handleBack} />
               }
               {smoothAnimationState.isShow.value || state.isCombineRender ? (
                 <div
@@ -684,14 +684,14 @@ export default defineComponent({
                   }
                   class={[styles.title, state.isCbsView && styles.blackTitle, "headeTopTitleBtn"]}
                   onClick={() => {
-                    isMusicList.value && (musicListShow.value = true);
+                    isMusicList.value && !state.isHomeWork && !query.isHideMusicList && (musicListShow.value = true);
                   }}
                 >
-                  {isMusicList.value && <div class={[styles.symbolNote, "driver-8"]}></div>}
+                  {isMusicList.value && !state.isHomeWork && !query.isHideMusicList && <div class={[styles.symbolNote, "driver-8"]}></div>}
                   <NoticeBar text={state.examSongName} background="none" />
                 </div>
               ) : (
-                isMusicList.value && !state.isHomeWork && (
+                isMusicList.value && !state.isHomeWork && !query.isHideMusicList && (
                   <img
                     src={listImg}
                     class={[styles.img, styles.listImg, "driver-8"]}

src/page-instrument/header-top/speed/index.tsx

@@ -61,6 +61,8 @@ export default defineComponent({
 		})
 		// 切换节拍器
 		const toggleSwitch = async (res: any) => {
+			metronomeDisable.value = res;
+			return
 			switchLoading.value = true;
 			try {
 			  if (storeData.isApp && state.enableEvaluation) {
@@ -137,14 +139,14 @@ export default defineComponent({
 							<div onClick={()=>{ speed.value = 110 }}>110</div>
 						</div>
 						{
-							state.isMixBeat && 
+							state.isMixBeat && state.modeType !== "evaluating" &&
 							<div class={styles.metronome}>
 								<div class={styles.tit}>节拍器</div>
 								<Switch 
 									class={switchLoading.value ? styles.switchLoading : ''}
 									v-model:modelValue={metronomeDisable.value} 
 									loading={switchLoading.value}
-									onChange={toggleSwitch}			
+									onChange={toggleSwitch}
 								></Switch>
 							</div>
 						}