Merge branch 'feature-903' into gyt-test

src/subpages/colexiu/buttons/index.tsx

@@ -94,7 +94,13 @@ const beforeCheck = (cb: (status: boolean) => void) => {
 const back: () => void = () => {
   // 如果是乐教通，点击返回按钮，需要关闭当前窗口
   if (window.location.href.includes('isYjt')) {
-    window.close();
+    window.parent.postMessage(
+      {
+        api: "api_YjtClose"
+      },
+      "*"
+    );
+    return
   }
   submitMaxScore()
   sendBackRecordTotalTime()
@@ -247,7 +253,7 @@ export default defineComponent({
               )}
             </Transition>
           </div>
-          <div class={[styles.moreButton]} style={{ opacity: detailState.initRendered ? 1 : 0 }}>           
+          <div class={[styles.moreButton]} style={{ opacity: detailState.initRendered ? 1 : 0 }}>
             {!search?.modelType && modelType.value !== 'init' && !detailState.frozenMode && !detailState.isLessonTrain && (
               <Button
                 data-step="m0"
@@ -307,8 +313,8 @@ export default defineComponent({
                     <div class={classNames(styles['botton-tips'],metronomeData.cursorMode === 3 ? styles.tipSpec : '')}>{metronomeData.cursorTips}</div>
                   </>}
                 </span>
-              </Button>            
-            </>             
+              </Button>
+            </>
             {detailState.initRendered && !search.lessonTrainingId && !search.questionId &&  detailState.activeDetail?.musicSheetType == 'CONCERT' && (
               <Button
                 class={[styles.button, styles.hasText]}
@@ -329,7 +335,7 @@ export default defineComponent({
             {['practice', 'evaluation'].includes(modelType.value) && (
               <>
                 {
-                  modelType.value === 'practice' ? 
+                  modelType.value === 'practice' ?
                   <Button
                     data-step="m1"
                     class={[styles.button, styles.hasText]}
@@ -361,7 +367,7 @@ export default defineComponent({
                   </Button>
                 )}
                 {
-                  modelType.value === 'practice' ? 
+                  modelType.value === 'practice' ?
                   <Button
                     data-step="m3"
                     class={[styles.button, styles.hasText]}
@@ -373,7 +379,7 @@ export default defineComponent({
                   >
                     <ButtonIcon key="music" name={SettingState.sett.fingering ? 'fingeringOn' : 'fingeringOff'} />
                     <span>指法</span>
-                  </Button> : null               
+                  </Button> : null
                 }
               </>
             )}
@@ -429,8 +435,8 @@ export default defineComponent({
 
                 <Evaluating ref={evaluatingRef} />
               </>
-            )}    
-                    
+            )}
+
             {['practice', 'evaluation'].includes(modelType.value) && !search.lessonTrainingId && (
               <Popover
                 trigger="manual"