diff --git a/public/static/offline/JSON/getCinemaInfo.json b/public/static/offline/JSON/getCinemaInfo.json index 71617d5..fb91281 100644 --- a/public/static/offline/JSON/getCinemaInfo.json +++ b/public/static/offline/JSON/getCinemaInfo.json @@ -2,8 +2,18 @@ "code": 200, "msg": "操作成功", "data": { - "cinemaName": "幸福蓝海", - "cinemaCode": "42f69ae1e37341f59b950541f6e87ad9", - "cinemaIntro": "电影院介绍电影院介绍电影院介绍电影院介绍电影院介绍电影院介绍电影院介绍电影院介绍电影院介绍电影院介绍电影院介绍电影院介绍电影院介绍" + "shopName": "琦王花生", + "shopNameEn": "", + "alias": "", + "logoUrl": "/iotFile/2022/06/21/4a5351cf63994588a5c327eab6482948.png", + "building": "A栋", + "floor": "B1层", + "houseNumber": "B124", + "intro": "优选沙壤土质原料,从培育、播种、施肥等各个种植环节层层把关只为给顾客提供均匀饱满的每一粒花生。 \r\n", + "introEn": "", + "materialList": ["/iotFile/2022/06/21/f7dc86b38ceb4804a40f29d239fab926.png"], + "cinemaName": "幸福蓝海国际影城", + "cinemaCode": "123456789", + "cinemaIntro": "电影院介绍" } } diff --git a/src/components/CarouselWithIntro/CarouselWithIntro.vue b/src/components/CarouselWithIntro/CarouselWithIntro.vue index 1c4c67f..200b132 100644 --- a/src/components/CarouselWithIntro/CarouselWithIntro.vue +++ b/src/components/CarouselWithIntro/CarouselWithIntro.vue @@ -80,6 +80,10 @@ const qr = computed(() => props.data.qrFileList ?? []) object-fit: cover; } } + .right { + flex: 1; + width: 100%; + } } .qrcodeWrapper { display: flex; diff --git a/src/views/Movie/Movie.vue b/src/views/Movie/Movie.vue index 32b6a9b..93a6539 100644 --- a/src/views/Movie/Movie.vue +++ b/src/views/Movie/Movie.vue @@ -12,7 +12,7 @@ import CarouselWithIntro from '@/components/CarouselWithIntro/CarouselWithIntro. const cinema = ref({}) getCinemaInfo().then(({ data }) => { - cinema.value = { title: data.cinemaName, content: data.cinemaIntro } + cinema.value = { title: data.shopName, content: data.intro, fileList: data.materialList } })