diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue index 8aff60c9..3b5479d4 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue @@ -11,6 +11,12 @@ + +
+
+
+ @@ -21,10 +27,11 @@ import VueSlickCarousel from 'vue-slick-carousel' import 'vue-slick-carousel/dist/vue-slick-carousel.css' // optional style for arrows & dots import 'vue-slick-carousel/dist/vue-slick-carousel-theme.css' +import Video from "@screen/components/Video"; export default { name: "Carousel", - components: { VueSlickCarousel }, + components: { VueSlickCarousel,Video }, props: { pictures: { type: Array, @@ -39,6 +46,10 @@ export default { // "require('@screen/images/shareWith/weChat-active.svg')" ] }, + videos: { + type: Array, + default: () => [] + }, }, data() { return { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue index 4781411f..59cb6169 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue @@ -1,89 +1,44 @@ @@ -124,7 +79,7 @@ export default { activeName: String, formData: { type: Object, - default: () => {}, + default: () => { }, }, }, data() { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue index 89fea858..cf1666aa 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue @@ -294,8 +294,9 @@ export default { data.visibility = otherConfig.visibility; data.pictures = otherConfig.pictures || []; - data.videoList = otherConfig.videoList || [] - // data.videoList = otherConfig.videoList || ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4'] + data.videoList = otherConfig.videoList || []; + // data.videoList = ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4', + // 'https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4'] } data.videoType = "mp4"; this.detailDialogFormData = data;