Merge branch 'feature-903' into gyt-test

src/subpages/colexiu/App.tsx

@@ -149,6 +149,13 @@ export default defineComponent({
     }
 
     onMounted(() => {
+      if (location.href.includes('isYjt')) {
+        window.document.title = '乐教通'
+        // 禁用右键菜单
+        document.addEventListener("contextmenu", function (event) {
+          event.preventDefault();
+        });
+      }
       // 进入页面设置常量
       postMessage({
         api: 'keepScreenLongLight',

src/subpages/colexiu/buttons/index.tsx

@@ -92,6 +92,10 @@ const beforeCheck = (cb: (status: boolean) => void) => {
 }
 
 const back: () => void = () => {
+  // 如果是乐教通，点击返回按钮，需要关闭当前窗口
+  if (window.location.href.includes('isYjt')) {
+    window.close();
+  }
   submitMaxScore()
   sendBackRecordTotalTime()
   postMessage({
@@ -207,7 +211,7 @@ export default defineComponent({
           style={search.headerHeight ? { height: '1rem', paddingTop: '0.25rem' } : ''}
         >
           <div class={styles.leftButton}>
-            {search?.modelType && !search.unitId ? null : <img class={styles.backbtn} src={iconBack} onClick={back} />}
+            {(search?.modelType && !search.unitId) || search.isHideBack ? null : <img class={styles.backbtn} src={iconBack} onClick={back} />}
             <div class={styles.titleWrap}>
               <div class={styles.title}>{detailState.activeDetail?.musicSheetName}</div>
               {search.albumName && <div class={styles.album}>{search.albumName}</div>}

src/subpages/colexiu/popups/follow/index.tsx

@@ -123,9 +123,10 @@ const handleEnd = () => {
   data.start = false
   openToggleRecord(false)
   data.index = getDefaultIndex()
-  setStepIndex(state.osmd, data.index)
+  setStepIndex(state.osmd, 0)
   // state.osmd.cursor.reset()
   getNoteIndex()
+  onClear()
 }
 
 /**
@@ -134,10 +135,13 @@ const handleEnd = () => {
  * 需要判断当前音符的后面是否都是休止音符（休止音符的频率都是-1），或者是否是最后一个音符了
  */
 const autoEndFollow = () => {
-	if (data.index >= detailState.times.length) {
+	if (data.index >= detailState.times.length-1) {
     // 如果开了自动循环需要重新开始跟练
     if (SettingState.sett.loop) {
-      handleStart()
+      handleEnd()
+      setTimeout(() => {
+        handleStart()
+      }, 0);
     } else {
       handleEnd()
     }
@@ -146,11 +150,14 @@ const autoEndFollow = () => {
 	let nextIndex = data.index + 1;
 	const rightTimes = detailState.times.slice(data.index,detailState.times.length)
 	// 后面的音符是否都是休止音符
-	const isAllRest = !rightTimes.some((item: any) => item.frequency > 1);
-	if (isAllRest && detailState.times[data.index].frequency < 1) {
+	const isAllRest = !rightTimes.some((item: any) => item?.frequency > 1);
+	if (isAllRest && detailState.times[data.index]?.frequency < 1) {
     // 如果开了自动循环需要重新开始跟练
     if (SettingState.sett.loop) {
-      handleStart()
+      handleEnd()
+      setTimeout(() => {
+        handleStart()
+      }, 0);
     } else {
       handleEnd()
     }
@@ -207,7 +214,7 @@ const checked = () => {
   for (let i = 0; i < data.list.length; i++) {
     const frequency = data.list[i]
     if (frequency > item.min && frequency < item.max) {
-      console.log(item.min, frequency, item.max)
+      // console.log(item.min, frequency, item.max)
       next()
       data.index += 1
       data.list = data.list.slice(i + 1)