From 27f5dec30ee350fa31b1a0b8aaffc11ba0423e28 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期四, 27 一月 2022 14:08:29 +0800
Subject: [PATCH] 冲突解决
---
src/components/wasmPlayer/index.vue | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/components/wasmPlayer/index.vue b/src/components/wasmPlayer/index.vue
index becc42e..db673dc 100644
--- a/src/components/wasmPlayer/index.vue
+++ b/src/components/wasmPlayer/index.vue
@@ -506,6 +506,7 @@
title: '娑堟伅',
message:'涓嬭浇澶辫触锛屾棤鏁堢殑瑙嗛鍦板潃'
});
+ return
}
if (this.isFullScreen) {
--
Gitblit v1.8.0