From 577cf5ef9ab2fb2d3233cdb5c52919b8a274be03 Mon Sep 17 00:00:00 2001 From: 闫增涛 <1829501689@qq.com> Date: 星期五, 16 八月 2024 11:20:23 +0800 Subject: [PATCH] 合并 --- src/books/sportsAndHealth/view/components/chapter003.vue | 160 +++++++--------------------------------------------- 1 files changed, 23 insertions(+), 137 deletions(-) diff --git a/src/books/sportsAndHealth/view/components/chapter003.vue b/src/books/sportsAndHealth/view/components/chapter003.vue index ac3ac13..6b53d20 100644 --- a/src/books/sportsAndHealth/view/components/chapter003.vue +++ b/src/books/sportsAndHealth/view/components/chapter003.vue @@ -1391,6 +1391,7 @@ x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100" :src="chapter003.videoUrl.v2"></video> <span>{{ chapter003.videoMd5.v2.name }}</span> + </div> <div class="videoItem" v-if="chapter003.videoShow1"> <video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5" @@ -7520,16 +7521,28 @@ </div> </div> </div> - <el-dialog :visible.sync="dialogVisible" width="60vw" top="2vh" append-to-body lock-scroll :show-close="false" - class="custom-dialog"> - <div slot="title" class="header_title"> - <span>{{ pdfTitle }}</span> - <span @click="closeDialog"> x </span> - </div> - <div class="pdfModal" v-if="dialogVisible"> - <preView :isClear="dialogVisible" :md5="p_md5"></preView> - </div> - </el-dialog> + + + + + <el-dialog + :visible.sync="dialogVisible" + width="60vw" + top="2vh" + append-to-body + lock-scroll + :show-close="false" + class="custom-dialog" + > + <div slot="title" class="header_title"> + <span>{{ pdfTitle }}</span> + <span @click="closeDialog"> x </span> + </div> + <div class="pdfModal" v-if="dialogVisible"> + <preView :isClear="dialogVisible" :md5="p_md5"></preView> + </div> + </el-dialog> + </div> </template> <script> @@ -7582,15 +7595,10 @@ isShowXyx12: false, isShowXyx13: false, isShowXyx14: false, - - - isShowXyx15: false, isShowXyx16: false, isShowXyx17: false, isShowXyx18: false, - - score1: 0, score2: 0, score3: 0, @@ -8273,10 +8281,7 @@ }, created() { - if (!this.isSearch) { - - this.getVideo(this.chapter003.videoMd5.v8.md5, 'v8') this.getVideo(this.chapter003.videoMd5.v9.md5, 'v9') this.getVideo(this.chapter003.videoMd5.v10.md5, 'v10') @@ -8290,7 +8295,6 @@ this.getVideo(this.chapter003.videoMd5.v18.md5, 'v18') this.getVideo(this.chapter003.videoMd5.v19.md5, 'v19') this.getVideo(this.chapter003.videoMd5.v20.md5, 'v20') - } const localData = JSON.parse(localStorage.getItem('chapter003')) @@ -8311,13 +8315,7 @@ }, activityXyx1() { this.isShowXyx01 = !this.isShowXyx01 - - - this.videoShow3 = true - - - }, async getVideo(md5, val) { const data = await getResourcePath(md5) @@ -8353,9 +8351,7 @@ activityXyx2() { this.isShowXyx02 = !this.isShowXyx02 - if (!this.isSearch && !this.chapter003.videoShow1) { - this.getVideo(this.chapter003.videoMd5.v1.md5, 'v1') this.getVideo(this.chapter003.videoMd5.v2.md5, 'v2') this.getVideo(this.chapter003.videoMd5.v3.md5, 'v3') @@ -8363,9 +8359,6 @@ this.getVideo(this.chapter003.videoMd5.v5.md5, 'v5') this.getVideo(this.chapter003.videoMd5.v6.md5, 'v6') this.getVideo(this.chapter003.videoMd5.v7.md5, 'v7') - - - } this.chapter003.videoShow1 = true @@ -8376,11 +8369,7 @@ activityXyx20() { this.isShowXyx020 = !this.isShowXyx020 - if (!this.isSearch && !this.chapter003.isShowXyx12) { - - - this.getVideos(this.chapter003.video2Md5.v1.md5, 'v1') this.getVideos(this.chapter003.video2Md5.v2.md5, 'v2') this.getVideos(this.chapter003.video2Md5.v3.md5, 'v3') @@ -8415,26 +8404,12 @@ this.getVideos(this.chapter003.video2Md5.v27.md5, 'v27') this.getVideos(this.chapter003.video2Md5.v28.md5, 'v28') this.getVideos(this.chapter003.video2Md5.v29.md5, 'v29') - }, 3000) - - - - - } - - - - - setTimeout(() => { this.chapter003.isShowXyx12 = true }, 1000) - - - setTimeout(() => { this.chapter003.isShowXyx13 = true @@ -8494,7 +8469,6 @@ this.getVideo(this.chapter003.videoMd5.v36.md5, 'v36') this.getVideo(this.chapter003.videoMd5.v37.md5, 'v37') } - this.chapter003.isShowXyx15 = true @@ -8621,91 +8595,3 @@ } </script> -<style lang="less" scoped> -.pdfModal { - width: 100%; - height: 90vh; -} - -.custom-dialog { - overflow: hidden !important; - - /deep/ .el-dialog__body { - padding: 0; - } - - /deep/ .el-dialog__header { - background-color: rgba(0, 0, 0, 0.8); - - .header_title { - display: flex; - justify-content: space-between; - align-items: center; - color: #fff; - font-weight: 900; - font-size: 16px; - font-family: 'FZLTXIHJW'; - - span:nth-child(2):hover { - cursor: pointer; - } - } - - /deep/.el-dialog__title, - /deep/ .el-dialog__headerbtn .el-dialog__close { - color: #fff; - font-weight: 900; - font-size: 16px; - font-family: 'FZLTXIHJW'; - } - } -} - -@media screen and (max-width: 1024px) { - .pdfModal { - width: 100%; - height: 80vh; - } - - .custom-dialog { - /deep/ .el-dialog { - width: 90vw !important; - } - } -} - -@media screen and (max-width: 800px) { - .pdfModal { - width: 100%; - height: 60vh; - } - - .custom-dialog { - /deep/ .el-dialog { - width: 90vw !important; - } - } -} -</style> -<style lang="less" scoped> -// b { -// color: #F79447; -// } - -.imgBox { - display: flex !important; - flex-direction: column-reverse !important; - position: relative !important; - - - .img { - position: absolute !important; - left: 40% !important; - bottom: -10% !important; - } - - img { - height: 80%; - } -} -</style> \ No newline at end of file -- Gitblit v1.9.1