diff --git a/src/components/upload/cropperImg.vue b/src/components/upload/cropperImg.vue index c776ecb..64bb7cb 100644 --- a/src/components/upload/cropperImg.vue +++ b/src/components/upload/cropperImg.vue @@ -50,8 +50,7 @@ + :fixedBox="props.cropType === 'fixed' ? true : false" :fixedNumber="props.fixedNumber" :maxImgSize="2000" /> diff --git a/src/components/video/videoViewer.vue b/src/components/video/videoViewer.vue new file mode 100644 index 0000000..a4ab4ef --- /dev/null +++ b/src/components/video/videoViewer.vue @@ -0,0 +1,41 @@ + + + diff --git a/src/view/ad/content.vue b/src/view/ad/content.vue index 3deb129..9599b31 100644 --- a/src/view/ad/content.vue +++ b/src/view/ad/content.vue @@ -13,10 +13,8 @@ @@ -92,12 +90,14 @@ -
- - 上传 +
+ + 直接上传 +
- + diff --git a/src/view/content/academician/index.vue b/src/view/content/academician/index.vue index 4557adc..47798a7 100644 --- a/src/view/content/academician/index.vue +++ b/src/view/content/academician/index.vue @@ -34,7 +34,7 @@ diff --git a/src/view/content/entrepreneur/index.vue b/src/view/content/entrepreneur/index.vue index 47e26f4..1ca795a 100644 --- a/src/view/content/entrepreneur/index.vue +++ b/src/view/content/entrepreneur/index.vue @@ -34,7 +34,7 @@ diff --git a/src/view/content/live/index.vue b/src/view/content/live/index.vue index 8ceb9e4..3568e1f 100644 --- a/src/view/content/live/index.vue +++ b/src/view/content/live/index.vue @@ -54,10 +54,10 @@ - + diff --git a/src/view/mediaFile/index.vue b/src/view/mediaFile/index.vue index affd56c..e2ad5a4 100644 --- a/src/view/mediaFile/index.vue +++ b/src/view/mediaFile/index.vue @@ -23,13 +23,8 @@ -
- - - -
-
+ +
@@ -76,9 +71,6 @@ @current-change="handleCurrentChange" @size-change="handleSizeChange" />
- -
@@ -88,6 +80,7 @@ import { getFileList, deleteFile, editFileName } from '@/api/mediaFile' import { downloadImage } from '@/utils/downloadImg' import UploadImage from '@/components/upload/image.vue' import UploadCommon from '@/components/upload/common.vue' +import VideoViewer from '@/components/video/videoViewer.vue' import CropperImg from '@/components/upload/cropperImg.vue' import { getDictFunc, formatDate, filterDict } from '@/utils/format' import WarningBar from '@/components/warningBar/warningBar.vue' @@ -231,14 +224,6 @@ const editFileNameFunc = async (row) => { }) }) } - -const videoPreviewDialog = ref(null) -const videoPreviewUrl = ref('') -const clickPreviewVideo = (url) => { - console.log('clickPreviewVideo') - videoPreviewDialog.value = true - videoPreviewUrl.value = url -}