From 3fe52975b5216d9b69916e2e16f1c6fe3a9e6e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com> Date: Mon, 1 Jul 2024 14:28:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=86=E7=A6=BB=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=AF=B4=E6=98=8Evideo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .hbuilderx/launch.json | 2 +- config/baseUrl.js | 8 +- pages/course/components/video.vue | 1112 +++++++++++++++ pages/course/courseSet.vue | 2137 +++++++++++++++-------------- 4 files changed, 2237 insertions(+), 1022 deletions(-) create mode 100644 pages/course/components/video.vue diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index dd7ee12..f81d5f4 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -24,7 +24,7 @@ "type" : "uni-app:app-ios" }, { - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" } ] diff --git a/config/baseUrl.js b/config/baseUrl.js index 6018dfc..2964962 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -5,8 +5,8 @@ if (process.env.NODE_ENV === 'development') { // baseUrl = "http://localhost:7001/"; // socketUrl = "ws://localhost:6001/"; // baseUrl = "https://twin-ui.com/demo/"; - // baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境 - baseUrl = "https://api.nuttyreading.com/"; // 线上正式 + baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境 + // baseUrl = "https://api.nuttyreading.com/"; // 线上正式 // baseUrl = "http://192.168.110.100:9200/pb/"; // 开发用电脑 // baseUrl = "http://59.110.212.44:9200/pb/"; // baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑 @@ -16,8 +16,8 @@ if (process.env.NODE_ENV === 'development') { } else if (process.env.NODE_ENV === 'production') { // 生产环境11 // baseUrl = "http://59.110.212.44:9100/pb/"; - // baseUrl = "https://testapi.nuttyreading.com/"; - baseUrl = "https://api.nuttyreading.com/"; //1 + baseUrl = "https://testapi.nuttyreading.com/"; + // baseUrl = "https://api.nuttyreading.com/"; //1 // baseUrl = "ws://twin-ui.com:6001/"; // socketUrl = "ws://twin-ui.com:6001/"; } diff --git a/pages/course/components/video.vue b/pages/course/components/video.vue new file mode 100644 index 0000000..e9532fb --- /dev/null +++ b/pages/course/components/video.vue @@ -0,0 +1,1112 @@ + + + + + + + diff --git a/pages/course/courseSet.vue b/pages/course/courseSet.vue index fb55f09..1173bba 100644 --- a/pages/course/courseSet.vue +++ b/pages/course/courseSet.vue @@ -1,1052 +1,1155 @@ \ No newline at end of file +audio { + width: 100% !important; +} + From 3b3cc95f9fbbfff5596b1ba9f4efeeea36b87a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com> Date: Mon, 1 Jul 2024 14:39:53 +0800 Subject: [PATCH 2/4] 111 --- pages/course/components/video.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pages/course/components/video.vue b/pages/course/components/video.vue index e9532fb..099866b 100644 --- a/pages/course/components/video.vue +++ b/pages/course/components/video.vue @@ -21,6 +21,7 @@ v-if="courseInfo.mediaType == 1 && courseInfo.media != ''" >
Date: Tue, 2 Jul 2024 11:27:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=80=8D=E9=80=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commonComponents/video/index.vue | 1888 +++++++++-------- 1 file changed, 976 insertions(+), 912 deletions(-) diff --git a/pages/component/commonComponents/video/index.vue b/pages/component/commonComponents/video/index.vue index f551d17..aa86a54 100644 --- a/pages/component/commonComponents/video/index.vue +++ b/pages/component/commonComponents/video/index.vue @@ -1,6 +1,6 @@ + .fullScreenButton-container { + color: #fff; + float: right; + height: 35px; + margin-top: 6px; + margin-right: 5px; + display: flex; + align-items: center; + position: relative; + + i { + color: #fff; + display: inline-block; + font-size: 22px; + display: block; + margin-top: 7px; + cursor: pointer; + + &+i { + margin-left: 3px; + } + + @media (min-width: 768px) { + &:hover+.player-tooltip { + display: block; + } + } + } + + .player-tooltip { + &.prev { + left: -10px; + } + + &.list { + left: 5px; + } + + &.next { + right: -12px; + } + } + } + + + .playlist-content { + position: absolute; + right: 0; + width: 0px; + padding-bottom: 48px; + box-sizing: border-box; + height: 100%; + transition: all 0.38s ease-in-out; + overflow: hidden; + + .list { + background-color: #000; + background-color: rgba(0, 0, 0, 0.3); + height: 100%; + overflow: auto; + + .video-item { + color: #fff; + padding: 0px 10px; + line-height: 35px; + font-size: 14px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + cursor: pointer; + + &.active { + background-color: #000; + color: #00ddff; + } + + @media (min-width: 768px) { + &:hover { + background-color: #000; + color: #00ddff; + } + } + } + } + } + + .player-tooltip { + position: absolute; + display: none; + font-size: 12px; + color: #fff; + line-height: 28px; + letter-spacing: 0; + text-align: center; + background: #3c3c3c; + box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.1); + height: 28px; + top: -48px; + padding: 0 5px; + white-space: nowrap; + } + + .playlist-skip-tip { + padding: 5px 15px; + position: absolute; + top: 50%; + left: 50%; + z-index: 30; + line-height: 30px; + font-size: 14px; + border-radius: 4px; + background: rgba(255, 255, 255, 0.8); + color: #000; + text-align: center; + transform: translate(-50%, -50%); + } + + #rotating-div { + width: 100vw; + height: 100vh; + background-color: #3498db; + transform: rotate(90deg); + /* 旋转90度 */ + transform-origin: center center; + /* 设置旋转中心点在div中心 */ + position: fixed; + /* 固定定位,全屏显示 */ + left: 0; + top: 0; + bottom: 0; + right: 0; + } + \ No newline at end of file From 883777751d582ea83b5b5bbd769881025fceea39 Mon Sep 17 00:00:00 2001 From: "@fawn-nine" <1271023382@qq.com> Date: Tue, 2 Jul 2024 11:31:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=80=8D=E9=80=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commonComponents/video/index.vue | 29 ++----------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/pages/component/commonComponents/video/index.vue b/pages/component/commonComponents/video/index.vue index aa86a54..e19cd67 100644 --- a/pages/component/commonComponents/video/index.vue +++ b/pages/component/commonComponents/video/index.vue @@ -575,32 +575,9 @@ 'http://101.201.146.165:8088/Pf-EH/statics/uploadFile/2024-05-10/b0f420c7-9178-41ad-9dd6-f59a64a6e190.png'] }, { - name: 'RateComponent', - type: AliPlayerComponent.RateComponent - }, - - // { - // name: 'adComponent1', - // type: beisuBtnComponent, - // args:['http://example.aliyundoc.com/cover.png'] - // { - // name: 'X0.75', - // speed: 0.75 - // }, { - // name: 'X1.0', - // speed: 1.0 - // }, { - // name: 'X1.25', - // speed: 1.25 - // }, { - // name: 'X1.5', - // speed: 1.5 - // }, { - // name: 'X2.0', - // speed: 2.0 - // }, - // ] - // }, + name: 'RateComponent', + type: AliPlayerComponent.RateComponent + }, // { // name: 'RotateMirrorComponent',