diff --git a/src/base/Marquees/Marquees.vue b/src/base/Marquees/Marquees.vue new file mode 100644 index 0000000..8013872 --- /dev/null +++ b/src/base/Marquees/Marquees.vue @@ -0,0 +1,115 @@ + + + + diff --git a/src/views/Billboard/Billboard.vue b/src/views/Billboard/Billboard.vue index 56d977c..3a9ea1a 100644 --- a/src/views/Billboard/Billboard.vue +++ b/src/views/Billboard/Billboard.vue @@ -28,7 +28,7 @@
- {{ data.shopName }} + {{ data.shopName }}
{{ data.distance ? data.distance + '米' : '' }}
@@ -76,6 +76,8 @@ import { getBrandListByFormat } from '@/http/brand/api' import QRCodeFromText from '@/components/QRCodeFromText/QRCodeFromText.vue' import { useMediaQuery, useWindowSize } from '@vueuse/core' import { setShopInactive } from '@/composables/useInitMap' +import Marquees from '@/base/Marquees/Marquees.vue' + const vmin = Math.min(window.innerWidth, window.innerHeight) const scale = vmin / 1080 const isH = useMediaQuery('(min-aspect-ratio: 1/1)') @@ -305,20 +307,20 @@ watch(scrollLefts, _scrollLefts => { overflow: hidden; text-overflow: hidden; .text { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + width: 100%; + height: 24px; } } .right { display: inline-flex; - flex: 0 0 100px; + flex: 0 0 60px; font-weight: 500; font-size: 16px; line-height: 19px; justify-content: flex-end; padding-right: 16px; color: rgba(0, 0, 0, 0.6); + white-space: nowrap; } .dir { width: 24px;