Merge branch 'develop' of https://gitlab.ilaihua.com/laihua-web/laihua-toolkit into develop

src/components/videoCutter/videoPlayer.vue

@@ -36,6 +36,7 @@ export default {
     beforeDestroy() {
         this.$refs.videoDom.removeEventListener('canplay')
         this.$refs.videoDom.removeEventListener('ended')
+        this.$refs.videoDom.removeEventListener('timeupdate')
     },
     methods: {
         canPlayFunc() {

src/views/videoCutter.vue

@@ -32,7 +32,7 @@ export default {
     },
     created() {},
     mounted() {
-        this.$bus.on('videoCutter.canPlay', this.canPlayFunc)
+        this.$bus.on('VideoCutter.canPlay', this.canPlayFunc)
     },
     methods: {
         changeVideo() {