diff --git a/src/base/ShopItem/ShopItem.vue b/src/base/ShopItem/ShopItem.vue index 6d18170..9faa3da 100644 --- a/src/base/ShopItem/ShopItem.vue +++ b/src/base/ShopItem/ShopItem.vue @@ -58,25 +58,19 @@
- -
{{ switchLanguage(shop, 'shopName') }}
-
{{ shop.floor }}
- - -
扫码导航
-
- - - +
+ +
{{ switchLanguage(shop, 'shopName') }}
+
{{ shop.floor }}
+ + +
扫码导航
+
@@ -87,7 +81,10 @@ import QRCodeFromText from '@/components/QRCodeFromText/QRCodeFromText.vue' import { storeToRefs } from 'pinia' import { useStore } from '@/store/root' import { computed } from 'vue' -import EffectFade from '@/components/EffectFade/EffectFade.vue' +import loc from './loc.vue' +import arrow from './arrow.vue' +import picsCom from './picsCom.vue' + const store = useStore() const { currentFloor, config, theme, showMap, path, shopPicsMap } = storeToRefs(store) const isBrandShowMap = computed(() => showMap.value && (path.value === '/brand' || path.value === '/foods')) @@ -423,7 +420,7 @@ const deactivate = () => store.SET_SHOP(null) left: 0; right: 0; bottom: 0; - z-index: 1000; + z-index: 10000; .content { position: absolute; bottom: 0; @@ -432,63 +429,71 @@ const deactivate = () => store.SET_SHOP(null) height: 870px; background: #fff; box-shadow: 0px 15px 24px 0px rgba(0, 0, 0, 0.05); + .header { + position: relative; + height: 180px; + background: var(--guide-floorBg); + } .logo { position: absolute; - top: 20px; + top: 30px; left: 68px; - width: 80px; - height: 80px; - border-radius: 12px; + width: 120px; + height: 120px; + border-radius: 16px; border: 1px solid var(--b-10, rgba(0, 0, 0, 0.1)); background: var(--w-100, #fff); - padding: 4px; + padding: 10px; } .name { position: absolute; - top: 30px; - left: 172px; - color: var(--b-80, rgba(0, 0, 0, 0.8)); - font-size: 24px; + top: 64px; + left: 220px; + color: var(--guide-floorColor); + font-size: 40px; font-style: normal; font-weight: 700; - line-height: 28px; + line-height: 47px; } .meta { position: absolute; - top: 66px; - left: 172px; + top: 123px; + left: 220px; height: 23px; display: inline-flex; - color: var(--b-60, rgba(0, 0, 0, 0.6)); + color: var(--guide-floorColor); font-size: 20px; font-style: normal; font-weight: 700; align-items: center; + opacity: 0.8; .loc { width: 20px; height: 20px; margin-right: 8px; + fill: currentColor; } } .qrcode { position: absolute; - top: -50px; - right: 168px; - width: 150px; - height: 150px; + top: 30px; + right: 202px; + width: 120px; + height: 120px; display: flex; justify-content: center; align-items: center; - border-radius: 12px; + border-radius: 16px; border: 1px solid var(--b-10, rgba(0, 0, 0, 0.1)); background: var(--w-100, #fff); } .qrcode-meta { position: absolute; display: inline-flex; - top: 65px; - right: 334px; - color: var(--b-60, rgba(0, 0, 0, 0.6)); + top: 122px; + right: 336px; + color: var(--guide-floorColor); + opacity: 0.6; font-size: 20px; font-style: normal; font-weight: 700; @@ -502,53 +507,10 @@ const deactivate = () => store.SET_SHOP(null) } .close { position: absolute; - width: 80px; - height: 80px; - top: 20px; - right: 68px; - } - .pics { - position: absolute; - left: 68px; + width: 120px; + height: 120px; + top: 30px; right: 68px; - top: 120px; - - :deep(.swiper) { - .swiper-pagination { - top: auto; - right: 0; - bottom: 0; - left: 0; - width: auto; - margin: auto; - .swiper-pagination-bullet { - width: 34px !important; - height: 4px !important; - background: var(--b-10, rgba(0, 0, 0, 0.1)); - border-radius: 6px !important; - opacity: inherit !important; - margin: 0; - - &.swiper-pagination-bullet-active { - background: var(--VI--, #516dd8); - border-radius: 6px !important; - } - } - } - } - .pics-wrapper { - position: relative; - width: 944px; - height: 724px; - border-radius: 16px; - overflow: hidden; - .banner { - width: 100%; - height: 708px; - object-fit: cover; - border-radius: 16px; - } - } } } } @@ -590,65 +552,48 @@ const deactivate = () => store.SET_SHOP(null) left: auto; right: 0; width: 610px; - height: 914px; - box-shadow: 0px 15px 24px 0px rgba(0, 0, 0, 0.05); - border-radius: 24px 24px 0 0; + height: 800px; .logo { - top: 40px; - left: 40px; - width: 150px; - height: 150px; - padding: 15px; + top: 30px; + left: 30px; + width: 120px; + height: 120px; + padding: 10px; } .name { - top: 74px; - left: 222px; + top: 40px; + right: 160px; + left: 180px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; } .meta { - top: 128px; - left: 222px; + top: 100px; + left: 180px; height: 28px; font-size: 24px; } .qrcode { - left: 40px; - bottom: 40px; - top: auto; + left: auto; + right: 30px; + bottom: auto; + top: 30px; } .qrcode-meta { - left: 222px; - bottom: 40px; - right: auto; - top: auto; - flex-direction: row-reverse; + top: 122px; + right: 158px; .arrow { margin-left: 0; margin-right: 4px; - transform: rotate(180deg); } } .close { - right: 40px; - bottom: 40px; - top: auto; - } - .pics { - position: absolute; - left: 15px; - right: 15px; - top: 230px; - .pics-wrapper { - width: 580px; - height: 451px; - border-radius: 16px; - overflow: hidden; - .banner { - width: 100%; - height: 435px; - object-fit: cover; - border-radius: 16px; - } - } + width: 80px; + height: 80px; + right: 30px; + bottom: auto; + top: -62px; } } } diff --git a/src/base/ShopItem/arrow.png b/src/base/ShopItem/arrow.png deleted file mode 100644 index b0ffc4e..0000000 Binary files a/src/base/ShopItem/arrow.png and /dev/null differ diff --git a/src/base/ShopItem/arrow.vue b/src/base/ShopItem/arrow.vue new file mode 100644 index 0000000..a8afc36 --- /dev/null +++ b/src/base/ShopItem/arrow.vue @@ -0,0 +1,12 @@ + + diff --git a/src/base/ShopItem/loc.png b/src/base/ShopItem/loc.png deleted file mode 100644 index ccdd7e3..0000000 Binary files a/src/base/ShopItem/loc.png and /dev/null differ diff --git a/src/base/ShopItem/loc.vue b/src/base/ShopItem/loc.vue new file mode 100644 index 0000000..64240b9 --- /dev/null +++ b/src/base/ShopItem/loc.vue @@ -0,0 +1,26 @@ + + diff --git a/src/base/ShopItem/picsCom.vue b/src/base/ShopItem/picsCom.vue new file mode 100644 index 0000000..5f052fa --- /dev/null +++ b/src/base/ShopItem/picsCom.vue @@ -0,0 +1,77 @@ + + +