diff --git a/package.json b/package.json index d2b61c4..70bd0ec 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dependencies": { "@moefe/vue-aplayer": "^2.0.0-beta.5", "ant-design-vue": "^1.6.5", + "artplayer": "^4.5.4", "clipboard": "^2.0.6", "cropperjs": "^1.5.6", "e-vue-contextmenu": "^0.1.3", @@ -52,7 +53,6 @@ "vue-aplayer": "^1.6.1", "vue-runtime-helpers": "^1.1.2", "vue-simple-uploader": "^0.7.4", - "vue-video-player": "^5.0.2", "vuedraggable": "^2.23.2", "vuex": "^3.1.0", "websocket": "^1.0.34" diff --git a/src/components/preview/Artplayer.vue b/src/components/preview/Artplayer.vue new file mode 100644 index 0000000..905e004 --- /dev/null +++ b/src/components/preview/Artplayer.vue @@ -0,0 +1,37 @@ + + + diff --git a/src/components/preview/VideoPreview.vue b/src/components/preview/VideoPreview.vue index ad324ea..dd932d1 100644 --- a/src/components/preview/VideoPreview.vue +++ b/src/components/preview/VideoPreview.vue @@ -2,25 +2,11 @@
-
-
+
+
- - +
@@ -28,15 +14,13 @@ @@ -198,9 +109,11 @@ export default { } .block { + + .close-bar { z-index: 2006; - position: relative; + position: absolute; top: -36px; right: -36px; float: right; @@ -212,7 +125,7 @@ export default { border-color: transparent transparent transparent #d4d4d475; line-height: 36px; opacity: 1; - transform: rotate(-45deg); + transform: rotate(315deg); } .close-bar:hover { @@ -221,13 +134,14 @@ export default { } .audio-player-close { - transform: rotate(-45deg); + transform: rotate(315deg); z-index: 2009; position: absolute; font-size: 18px; top: -8px; right: 13px; } + } .wrapper { @@ -237,7 +151,4 @@ export default { height: 100%; } -.block { - width: 900px; -}