Merge branch 'feature-tianyong' into gym-dev

src/page-instrument/view-detail/index.tsx

@@ -117,7 +117,7 @@ export default defineComponent({
         }
       }
     };
-    console.time('开始加载')
+    console.time('加载过程')
     onBeforeMount(async () => {
       // console.time("渲染加载耗时");
       api_keepScreenLongLight();
@@ -210,6 +210,8 @@ export default defineComponent({
     const handleRendered = (osmd: any) => {
       api_cloudLoading();
       console.timeEnd("渲染加载耗时");
+      console.timeLog('加载过程','谱面渲染完成')
+      state.isLoading = false
       detailData.skeletonLoading = false;
       state.osmd = osmd;
       // 没有设置速度使用读取的速度

src/view/audio-list/index.tsx

@@ -381,7 +381,7 @@ export async function changeCombineAudio (combineIndex: number){
 		return
 	}
 	state.loadingText = "音频资源加载中，请稍后…";
-	state.isLoading = true;
+	//state.isLoading = true;
 	const musicUrl = audioData.combineMusics[combineIndex]
 	// 有就拿缓存，没有就加载
 	const cacheMusicIndex = audioData.combineMusicEles.findIndex(ele => {
@@ -641,8 +641,9 @@ export default defineComponent({
 				changeMingSongType()
 
 				state.audioDone = true;
-				state.isLoading = false
+				// state.isLoading = false
 				console.timeEnd("音频加载时间123")
+				console.timeLog('加载过程','音频加载完成')
 				console.log("音频数据：",audioData)
 				api_playProgress(progress);
 			} else {
@@ -655,7 +656,7 @@ export default defineComponent({
 				// 监听midi播放结束
 				api_cloudplayed(midiPlayEnd);
 			}
-			console.timeEnd('开始加载')
+			console.timeEnd('加载过程')
 		});
 		onUnmounted(() => {
 			api_remove_cloudplayed(midiPlayEnd);