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

# Conflicts:
#	unpackage/dist/build/web/static/js/chunk-vendors.7d4aca93.js
#	unpackage/dist/build/web/static/js/pages-exam-qrcode.1a759ef3.js
#	unpackage/dist/build/web/static/js/pages-forward.c5cbf150.js
#	unpackage/dist/build/web/static/js/pages-index-index.608400b3.js
#	unpackage/dist/build/web/static/js/pages-login-loading.02553b67.js
#	unpackage/dist/build/web/static/js/pages-login-login.7490a771.js
#	unpackage/dist/build/web/static/js/pages-login-next.6f865c5b.js
#	unpackage/dist/build/web/static/js/pages-my-follow.8d387f6b.js
#	unpackage/dist/build/web/static/js/pages-my-myArticles.1d3f8869.js
#	unpackage/dist/build/web/static/js/pages-my-myQa.6036d3e6.js
#	unpackage/dist/build/web/static/js/pages-my-toMeShares.da6f1e81.js
#	unpackage/dist/build/web/static/js/pages-news-index.abae1739.js
#	unpackage/dist/build/web/static/js/pages-resource-articeDetail.98c68738.js
#	unpackage/dist/build/web/static/js/pages-resource-courseDetail.b3cb74ac.js
#	unpackage/dist/build/web/static/js/pages-resource-index.059f24e6.js
#	unpackage/dist/build/web/static/js/pages-resource-microDetail.552dc575.js
#	unpackage/dist/build/web/static/js/pages-resource-qaDetail.c178d3de.js
#	unpackage/dist/build/web/static/js/pages-resource-search.4ff0fbf2.js
#	unpackage/dist/build/web/static/js/pages-study-audioTest.00ad8db3.js
#	unpackage/dist/build/web/static/js/pages-study-courseStudy.363105db.js
#	unpackage/dist/build/web/static/js/pages-study-onlineCourse.491168af.js
#	unpackage/dist/build/web/static/js/pages-study-videoTest.c72774df.js
This commit is contained in:
joshen
2025-08-28 16:28:37 +08:00
600 changed files with 7 additions and 6 deletions

View File

@@ -272,6 +272,8 @@
},
// 全屏+退出全屏
fullScreen(){
console.log( "full screen")
this.$listeners['fullscreenchange'](this.fullScreenFlag)
var _this = this
if(this.fullScreenFlag){
//this.videoContext.exitFullScreen();
@@ -291,7 +293,7 @@
if(document.documentElement.requestFullscreen){
// document.documentElement.requestFullscreen();
}else{
window.screenTop(0)
// window.screenTop(0)
}
uni.getSystemInfo({
success: function (info) {
@@ -300,7 +302,6 @@
}
});
}
this.$listeners['fullscreenchange'](this.fullScreenFlag)
},
// // 全屏模式下,横屏+竖屏
// horizontalScreen(){

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More