no message

Author: wangxd

lib/components/d-contextmenu.vue

@@ -2,11 +2,7 @@
  * @Author: web.王晓冬
  * @Date: 2021-08-26 12:13:47
  * @LastEditors: web.王晓冬
-<<<<<<< HEAD
- * @LastEditTime: 2021-08-26 18:36:31
-=======
- * @LastEditTime: 2021-08-28 12:33:51
->>>>>>> 90a3c62fe7e4a73a584696c85a2646a5e039c396
+ * @LastEditTime: 2021-08-30 09:25:09
  * @Description: file content
 */
 <template>
@@ -123,26 +119,6 @@ const keydownHandle = (ev) => {
 };
 // 显示菜单
 const contextmenuShow = (ev) => {
-<<<<<<< HEAD
-    ev.preventDefault()
-    on(window, 'keydown', keydownHandle) //启用快捷键 
-    on(window, 'click', contextmenuHide) //启用点击键
-    let refPlayerWrap = document.querySelector('#refPlayerWrap')
-    let clientWidth = refPlayerWrap.clientWidth
-    let clientHeight = refPlayerWrap.clientHeight
-    let mouseX = ev.clientX - refPlayerWrap.getBoundingClientRect().left
-    if ((clientWidth - mouseX) < 130) {
-        state.mouseX = mouseX + (clientWidth - mouseX - 130)
-        // state.mouseX = state.mouseX - (clientWidth - state.mouseX)
-    } else {
-        state.mouseX = mouseX
-    }
-
-    state.mouseY = ev.clientY - refPlayerWrap.getBoundingClientRect().top
-    state.show = true
-
-}
-=======
   ev.preventDefault();
   on(window, "keydown", keydownHandle); //启用快捷键
   on(window, "click", contextmenuHide); //启用点击键
@@ -154,7 +130,6 @@ const contextmenuShow = (ev) => {
     state.mouseX = state.mouseX + (clientWidth - state.mouseX - 130);
     // state.mouseX = state.mouseX - (clientWidth - state.mouseX)
   }
->>>>>>> 90a3c62fe7e4a73a584696c85a2646a5e039c396
 
   state.mouseY = ev.clientY - refPlayerWrap.getBoundingClientRect().top;
   state.show = true;
@@ -187,17 +162,6 @@ const contextmenuHide = (ev) => {
 };
 
 onMounted(() => {
-<<<<<<< HEAD
-    let refPlayerWrap = document.querySelector('#refPlayerWrap')
-    // 卸载快捷键
-    off(window, 'keydown', keydownHandle)
-    off(window, 'click', contextmenuHide) //启用点击键
-    off(refPlayerWrap, 'contextmenu', contextmenuShow)
-    // 开启右键菜单
-    on(refPlayerWrap, 'contextmenu', contextmenuShow)
-
-})
-=======
   let refPlayerWrap = document.querySelector("#refPlayerWrap");
   // 卸载快捷键
   off(window, "keydown", keydownHandle);
@@ -206,7 +170,6 @@ onMounted(() => {
   // 开启右键菜单
   on(refPlayerWrap, "contextmenu", contextmenuShow);
 });
->>>>>>> 90a3c62fe7e4a73a584696c85a2646a5e039c396
 onUnmounted(() => {
   let refPlayerWrap = document.querySelector("#refPlayerWrap");
   off(window, "keydown", keydownHandle);

lib/video-play/main.vue

@@ -2,11 +2,7 @@
  * @Author: web.王晓冬
  * @Date: 2020-11-03 16:29:47
  * @LastEditors: web.王晓冬
-<<<<<<< HEAD
- * @LastEditTime: 2021-08-26 18:30:14
-=======
- * @LastEditTime: 2021-08-29 10:58:20
->>>>>>> 90a3c62fe7e4a73a584696c85a2646a5e039c396
+ * @LastEditTime: 2021-08-30 09:25:32
  * @Description: file content
 */
 
@@ -268,21 +264,13 @@ const state = reactive({
   playProgress: 0, //播放进度
   isMultiplesPlay: false, //是否倍速播放
   longPressTimeout: null,
-<<<<<<< HEAD
-  progressCursorTime: '00:00:00', //进度条光标时间
-
-})
-const compose = (...args) => (value) => args.reverse().reduce((acc, fn) => fn(acc), value);
-
-=======
   progressCursorTime: "00:00:00", //进度条光标时间
   qualityLevels: []
 });
 const compose =
   (...args) =>
     (value) =>
       args.reverse().reduce((acc, fn) => fn(acc), value);
->>>>>>> 90a3c62fe7e4a73a584696c85a2646a5e039c396
 // 收集video事件
 const videoEvents = videoEmits.reduce((events, emit) => {
   let name = `on${firstUpperCase(emit)}`;