From a2967793c38724decd266ffd8e96ac41fafc0040 Mon Sep 17 00:00:00 2001 From: jiannibang <271381693@qq.com> Date: Fri, 7 Jul 2023 09:48:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E8=AE=A1=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Billboard/Billboard.vue | 2 +- src/views/Guide/Guide.vue | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/views/Billboard/Billboard.vue b/src/views/Billboard/Billboard.vue index 8574e86..c4a5473 100644 --- a/src/views/Billboard/Billboard.vue +++ b/src/views/Billboard/Billboard.vue @@ -103,7 +103,7 @@ Promise.all([getBrandListByFormat()]).then(([{ data: brandListByFormat }]) => { return { ...brand, shopList: brand.shopList - .filter(shop => shop.floor === currentFloor.value.floor) + .filter(shop => !!shop.yaxis && shop.floor === currentFloor.value.floor) .map(shop => { const meta = currentFloorShopMap.value[shop.shopCode] return { ...shop, ...(meta ? meta : {}) } diff --git a/src/views/Guide/Guide.vue b/src/views/Guide/Guide.vue index 9a4db1c..1774e0e 100644 --- a/src/views/Guide/Guide.vue +++ b/src/views/Guide/Guide.vue @@ -25,7 +25,11 @@
- {{ fac.title }} + +
{{ fac.title }}
@@ -46,7 +50,11 @@
- {{ fac.title }} + +
{{ fac.title }}
{{ formatMap[item.floor] }}
@@ -187,7 +195,7 @@ function changeFloor(index) { selectedShopList.value = shopList.value.map(brand => ({ ...brand, shopList: brand.shopList - .filter(item => item.floor === floor.floor) + .filter(item => !!item.yaxis && item.floor === floor.floor) .map(item => { const meta = currentFloorShopMap.value[item.shopCode] return { ...item, ...(meta ? meta : {}) } @@ -214,7 +222,7 @@ function filterAboutCurrentInfo(needShowFloor = true) { selectedShopList.value = shopList.value.map(brand => ({ ...brand, shopList: brand.shopList - .filter(item => item.floor === floor) + .filter(item => !!item.yaxis && item.floor === floor) .map(item => { const meta = currentFloorShopMap.value[item.shopCode] return { ...item, ...(meta ? meta : {}) } @@ -276,7 +284,7 @@ const handleFacility = fac => { background: var(--guide-allFloorBg); z-index: 100; .row { - height: 76px; + height: 89px; display: flex; &.current { .left {