From 4b80e89973960907915dedddbd73fd2dd4578261 Mon Sep 17 00:00:00 2001
From: du <13220750630.163.com>
Date: 星期二, 01 四月 2025 14:30:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
easegen-front/src/views/digitalcourse/digitalhumans/DigitalHumansForm.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/easegen-front/src/views/digitalcourse/digitalhumans/DigitalHumansForm.vue b/easegen-front/src/views/digitalcourse/digitalhumans/DigitalHumansForm.vue
index 49f7c2e..848ea7d 100644
--- a/easegen-front/src/views/digitalcourse/digitalhumans/DigitalHumansForm.vue
+++ b/easegen-front/src/views/digitalcourse/digitalhumans/DigitalHumansForm.vue
@@ -54,7 +54,10 @@
褰撳墠姝ｅ湪澶勭悊骞朵笂浼犱腑锛岃鑰愬績绛夊緟...
</div>
</div> -->
- <video-player v-if="formData.videoUrl || formData.fixVideoUrl" :property="videoProperty"/>
+ <!-- 鍘熻棰戞挱鏀惧櫒 -->
+ <!-- <video-player v-if="formData.videoUrl || formData.fixVideoUrl" :property="videoProperty"/> -->
+ <!-- 鏂扮殑瑙嗛鎾斁鍣� -->
+ <VideoPlayerMov v-if="formData.videoUrl || formData.fixVideoUrl" :property="videoProperty"/>
</el-form-item>
<!-- <el-form-item :label="鎶犲浘鏍囪瘑" prop="matting">
<el-select v-model="formData.matting" :placeholder="璇烽�夋嫨鎶犲浘鏍囪瘑">
@@ -97,6 +100,7 @@
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import * as DigitalHumansApi from '@/api/digitalcourse/digitalhumans'
import VideoPlayer from "@/components/DiyEditor/components/mobile/VideoPlayer/index.vue";
+import VideoPlayerMov from "@/components/DiyEditor/components/mobile/VideoPlayer_mov/index.vue";
import {DiyComponent} from "@/components/DiyEditor/util";
import {VideoPlayerProperty} from "@/components/DiyEditor/components/mobile/VideoPlayer/config";
import { useUpload } from '@/components/UploadFile/src/useUpload'
--
Gitblit v1.9.3