Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod

# Conflicts:
#	pages/study/courseStudy.vue
This commit is contained in:
joshen
2025-08-27 14:15:44 +08:00
72 changed files with 172 additions and 164 deletions

View File

@@ -1,7 +1,7 @@
<template>
<!--新的课程学习页面没有中间的详细页面了课程点过来就是这个用户未报名就直接报名-->
<view>
<page-title :showBack="true" :sticky="true" @go="goBack">视频详情</page-title>
<page-title :showBack="true" :sticky="true" v-if="showNavbar" @go="goBack">视频详情</page-title>
<watermark></watermark>
<u-toast ref="messager"></u-toast>
<!-- <page-title :showBack="true"></page-title> -->
@@ -525,6 +525,7 @@
warn:"测试内容",
warnTitle:"测试提示",
renderCourse:true
showNavbar: true
}
},
computed: {
@@ -1640,9 +1641,10 @@
});
}
},
onFullScreen(e){
//console.log(e,'e');
onFullScreen(screen){
console.log("video screen status", screen)
// debugger
this.showNavbar = !screen
},
onPlayerPause(){