Bladeren bron

Merge branch 'gyt-feature-tianyong' into gyt-test

TIANYONG 1 jaar geleden
bovenliggende
commit
b1746e5c69

+ 2 - 0
src/pages/detail/runtime.ts

@@ -450,6 +450,7 @@ export const refreshPlayer = async (ctime?: number) => {
       }
       // 如果是单元测验 和课后训练直接结束
       if (unitTestData.isSelectMeasureMode && state.evaluatingStatus){
+        console.log(1)
         event.emit('ended')
         return
       }
@@ -467,6 +468,7 @@ export const refreshPlayer = async (ctime?: number) => {
     if(detailState.activeDetail?.isAppPlay && state.durationNum + 3 < currentTimeNum) {
       if (state.evaluatingStatus) {
         pause()
+        console.log(2)
         event.emit('ended', new Event('ended'))
       } else {
         if (SettingState.sett.loop) {

+ 2 - 0
src/pages/detail/state.ts

@@ -84,6 +84,8 @@ const state = reactive({
   gradualVersion: GradualVersion.BASE as GradualVersion,
   /** 是否需要刷新选段小节,谱面重新渲染后需要刷新选段小节 */
   isNeedRefreshSection: false,
+  /** 是否是课后训练模式 */
+  isLessonTrain: false,
 })
 
 export const isRhythmicExercises = () => {

+ 3 - 2
src/subpages/colexiu/buttons/index.tsx

@@ -146,7 +146,8 @@ export default defineComponent({
 
     //根据路由传参设置模式
     const useRouteSetModelType = () => {
-      const modelType: IModelType = search.modelType as IModelType
+      // 课后练习,只能选择练习模式
+      const modelType: IModelType = search.lessonTrainingId ? 'practice' : search.modelType as IModelType
       if (modelType && modelType != 'evaluation') {
         onChangeModelType(modelType)
       }
@@ -235,7 +236,7 @@ export default defineComponent({
             </Transition>
           </div>
           <div class={[styles.moreButton]} style={{ opacity: detailState.initRendered ? 1 : 0 }}>           
-            {!search?.modelType && modelType.value !== 'init' && !detailState.frozenMode && (
+            {!search?.modelType && modelType.value !== 'init' && !detailState.frozenMode && !detailState.isLessonTrain && (
               <Button
                 data-step="m0"
                 class={[styles.button, styles.hasText]}

+ 1 - 0
src/subpages/colexiu/index.tsx

@@ -68,6 +68,7 @@ export default defineComponent({
     const tipShow = ref(false)
     // console.log("🚀 ~ 查询字符串",  search)
     detailState.midiPlayIniting = true
+    detailState.isLessonTrain = search.lessonTrainingId ? true : false
     const renderLoading = ref(true)
     const compulsionEvaluating = ref(false)
     const score = ref<string>('')