Merge branch 'feature-tianyong-newVersion' of http://git.dayaedu.com/liushengqiang/music-score into kt-dev

src/helpers/communication.ts

@@ -528,4 +528,12 @@ export const simple_paused = (callback: any) => {
 /** 监听APP拖动进度 */
 export const simple_updateProgress = (callback: any) => {
 	listenerMessage("api_updateProgress", callback);
+};
+
+/** simple页面渲染完成 */
+export const simple_musicPage = (content: any) => {
+	postMessage({
+		api: "api_musicPage",
+		content,
+	});
 };

src/page-instrument/App.tsx

@@ -54,17 +54,21 @@ export default defineComponent({
       if (query.Authorization) {
         setToken(query.Authorization);
       }
-      if (!getToken()) {
-        const res = await api_getToken();
-        if (res?.content) {
-          const content = res.content;
-          const token = content.tokenType + " " + content.accessToken;
-          setToken(token);
+      if (window.location.href.includes("simple-detail")) {
+        // 
+      } else {
+        if (!getToken()) {
+          const res = await api_getToken();
+          if (res?.content) {
+            const content = res.content;
+            const token = content.tokenType + " " + content.accessToken;
+            setToken(token);
+          }
+        }
+        if (query.productXmlImg) {
+          storeData.status = "login";
+          return;
         }
-      }
-      if (query.productXmlImg) {
-        storeData.status = "login";
-        return;
       }
       setUser();
       setBehaviorId(getRandomKey());

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

@@ -8,7 +8,7 @@ import store from "store";
 import { formateTimes } from "../../helpers/formateMusic";
 import { setCustomGradual, setCustomNoteRealValue } from "/src/helpers/customMusicScore"
 import { initSmoothAnimation, smoothAnimationState, destroySmoothAnimation, moveSmoothAnimationByPlayTime } from "../view-detail/smoothAnimation";
-import { api_playProgress, api_cloudLoading, simple_playProgress, simple_remove_playProgress, simple_play, simple_paused, simple_updateProgress } from "/src/helpers/communication";
+import { api_playProgress, api_cloudLoading, simple_playProgress, simple_remove_playProgress, simple_play, simple_paused, simple_updateProgress, simple_musicPage } from "/src/helpers/communication";
 
 export default defineComponent({
 	name: "simple-detail",
@@ -114,7 +114,10 @@ export default defineComponent({
 				  height: svgHeight
 				},
 				"*"
-			);			
+			);		
+			simple_musicPage({
+				height: svgHeight
+			})	
 			// state.playState = 'play';
 			// setStep();
 		};