Browse Source

feat: 店铺二维码弹窗背景文字颜色配置

v1.0.1
jiannibang 4 years ago
parent
commit
c15879f439
  1. 16
      src/base/ShopItem/ShopItem.vue
  2. BIN
      src/base/ShopItem/close.png
  3. BIN
      src/themes/business/brandQrcodeClose.png
  4. 4
      src/themes/business/style.json
  5. BIN
      src/themes/dark/brandQrcodeClose.png
  6. BIN
      src/themes/dark/grid.png
  7. BIN
      src/themes/dark/gridActive.png
  8. BIN
      src/themes/dark/row.png
  9. BIN
      src/themes/dark/rowActive.png
  10. 4
      src/themes/dark/style.json
  11. BIN
      src/themes/fashion/brandQrcodeClose.png
  12. 4
      src/themes/fashion/style.json
  13. BIN
      src/themes/highend/brandQrcodeClose.png
  14. 4
      src/themes/highend/style.json
  15. BIN
      src/themes/luxury/brandQrcodeClose.png
  16. 4
      src/themes/luxury/style.json
  17. BIN
      src/themes/main/billboardLoc.png
  18. BIN
      src/themes/main/brandQrcodeClose.png
  19. 4
      src/themes/main/style.json
  20. 3
      src/views/Guide/grid.svg
  21. 3
      src/views/Guide/gridActive.svg
  22. 3
      src/views/Guide/row.svg
  23. 3
      src/views/Guide/rowActive.svg

16
src/base/ShopItem/ShopItem.vue

@ -22,7 +22,13 @@
<Transition appear enter-active-class="animate__animated animate__fadeIn" leave-active-class="animate__animated animate__fadeOut"> <Transition appear enter-active-class="animate__animated animate__fadeIn" leave-active-class="animate__animated animate__fadeOut">
<div v-if="isActive && isRow" class="qrcode-modal" @click="deactivate"> <div v-if="isActive && isRow" class="qrcode-modal" @click="deactivate">
<div class="content" @click.stop="void 0"> <div class="content" @click.stop="void 0">
<div class="close" @click="deactivate"></div>
<div
class="close"
:style="{
backgroundImage: `url(${theme.images.brandQrcodeClose}) `
}"
@click="deactivate"
></div>
<QRCodeFromText <QRCodeFromText
class="qrcode" class="qrcode"
:size="135" :size="135"
@ -42,7 +48,7 @@ import { storeToRefs } from 'pinia'
import { useStore } from '@/store/root' import { useStore } from '@/store/root'
const store = useStore() const store = useStore()
const { currentFloor, config } = storeToRefs(store)
const { currentFloor, config, theme } = storeToRefs(store)
const props = defineProps({ const props = defineProps({
shop: Object, shop: Object,
@ -248,7 +254,7 @@ const deactivate = () => store.SET_SHOP(null)
height: 300px; height: 300px;
left: 391px; left: 391px;
bottom: 427px; bottom: 427px;
background: rgba(255, 255, 255, 0.8);
background: var(--brand-qrcodeBg, rgba(255, 255, 255, 0.8));
box-shadow: 0px 20px 60px rgba(0, 0, 0, 0.2); box-shadow: 0px 20px 60px rgba(0, 0, 0, 0.2);
backdrop-filter: blur(7px); backdrop-filter: blur(7px);
border-radius: var(--global-radius, 12px); border-radius: var(--global-radius, 12px);
@ -261,7 +267,7 @@ const deactivate = () => store.SET_SHOP(null)
height: 56px; height: 56px;
right: 8px; right: 8px;
top: 8px; top: 8px;
background: center / cover no-repeat url(./close.png);
background: center / cover no-repeat;
} }
.qrcode { .qrcode {
width: 150px; width: 150px;
@ -277,7 +283,7 @@ const deactivate = () => store.SET_SHOP(null)
line-height: 23px; line-height: 23px;
text-align: center; text-align: center;
margin-top: 27px; margin-top: 27px;
color: rgba(0, 0, 0, 0.8);
color: var(--brand-qrcodeTextColor, rgba(0, 0, 0, 0.8));
} }
} }
} }

BIN
src/base/ShopItem/close.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
src/themes/business/brandQrcodeClose.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 876 B

4
src/themes/business/style.json

@ -63,7 +63,9 @@
"color": "rgba(0, 0, 0, 0.8)", "color": "rgba(0, 0, 0, 0.8)",
"metaColor": "rgba(0, 0, 0, 0.6)", "metaColor": "rgba(0, 0, 0, 0.6)",
"floorNameColor": "rgba(0, 0, 0, 0.8)", "floorNameColor": "rgba(0, 0, 0, 0.8)",
"floorMetaColor": "rgba(0, 0, 0, 0.6)"
"floorMetaColor": "rgba(0, 0, 0, 0.6)",
"qrcodeBg": "rgba(255, 255, 255, 0.8)",
"qrcodeTextColor": "rgba(0, 0, 0, 0.8)"
}, },
"food": { "food": {
"background": "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 100%)", "background": "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 100%)",

BIN
src/themes/dark/brandQrcodeClose.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
src/themes/dark/grid.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 781 B

BIN
src/themes/dark/gridActive.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 766 B

After

Width:  |  Height:  |  Size: 758 B

BIN
src/themes/dark/row.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 768 B

After

Width:  |  Height:  |  Size: 752 B

BIN
src/themes/dark/rowActive.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 738 B

After

Width:  |  Height:  |  Size: 732 B

4
src/themes/dark/style.json

@ -63,7 +63,9 @@
"color": "#FFFFFF", "color": "#FFFFFF",
"metaColor": "rgba(255, 255, 255, 0.6)", "metaColor": "rgba(255, 255, 255, 0.6)",
"floorNameColor": "#FFFFFF", "floorNameColor": "#FFFFFF",
"floorMetaColor": "rgba(255, 255, 255, 0.8)"
"floorMetaColor": "rgba(255, 255, 255, 0.8)",
"qrcodeBg": "rgba(0, 0, 0, 0.8)",
"qrcodeTextColor": "#FFFFFF"
}, },
"food": { "food": {
"background": "linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.2) 100%)", "background": "linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.2) 100%)",

BIN
src/themes/fashion/brandQrcodeClose.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

4
src/themes/fashion/style.json

@ -63,7 +63,9 @@
"color": "rgba(0, 0, 0, 0.8)", "color": "rgba(0, 0, 0, 0.8)",
"metaColor": "rgba(0, 0, 0, 0.6)", "metaColor": "rgba(0, 0, 0, 0.6)",
"floorNameColor": "#fff", "floorNameColor": "#fff",
"floorMetaColor": "rgba(255, 255, 255, 0.8)"
"floorMetaColor": "rgba(255, 255, 255, 0.8)",
"qrcodeBg": "rgba(255, 255, 255, 0.8)",
"qrcodeTextColor": "rgba(0, 0, 0, 0.8)"
}, },
"food": { "food": {
"background": "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 100%)", "background": "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 100%)",

BIN
src/themes/highend/brandQrcodeClose.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

4
src/themes/highend/style.json

@ -63,7 +63,9 @@
"color": "rgba(0, 0, 0, 0.8)", "color": "rgba(0, 0, 0, 0.8)",
"metaColor": "rgba(0, 0, 0, 0.6)", "metaColor": "rgba(0, 0, 0, 0.6)",
"floorNameColor": "#fff", "floorNameColor": "#fff",
"floorMetaColor": "rgba(255, 255, 255, 0.8)"
"floorMetaColor": "rgba(255, 255, 255, 0.8)",
"qrcodeBg": "rgba(255, 255, 255, 0.8)",
"qrcodeTextColor": "rgba(0, 0, 0, 0.8)"
}, },
"food": { "food": {
"background": "linear-gradient(180deg, rgba(219, 194, 161, 0) 0%, #DBC2A1 100%, #DBC2A1 100%)", "background": "linear-gradient(180deg, rgba(219, 194, 161, 0) 0%, #DBC2A1 100%, #DBC2A1 100%)",

BIN
src/themes/luxury/brandQrcodeClose.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

4
src/themes/luxury/style.json

@ -63,7 +63,9 @@
"color": "rgba(0, 0, 0, 0.8)", "color": "rgba(0, 0, 0, 0.8)",
"metaColor": "rgba(0, 0, 0, 0.6)", "metaColor": "rgba(0, 0, 0, 0.6)",
"floorNameColor": "rgba(0, 0, 0, 0.8)", "floorNameColor": "rgba(0, 0, 0, 0.8)",
"floorMetaColor": "rgba(0, 0, 0, 0.6)"
"floorMetaColor": "rgba(0, 0, 0, 0.6)",
"qrcodeBg": "rgba(255, 255, 255, 0.8)",
"qrcodeTextColor": "rgba(0, 0, 0, 0.8)"
}, },
"food": { "food": {
"background": "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 100%)", "background": "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 100%)",

BIN
src/themes/main/billboardLoc.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 911 B

BIN
src/themes/main/brandQrcodeClose.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

4
src/themes/main/style.json

@ -63,7 +63,9 @@
"color": "rgba(0, 0, 0, 0.8)", "color": "rgba(0, 0, 0, 0.8)",
"metaColor": "rgba(0, 0, 0, 0.6)", "metaColor": "rgba(0, 0, 0, 0.6)",
"floorNameColor": "rgba(0, 0, 0, 0.8)", "floorNameColor": "rgba(0, 0, 0, 0.8)",
"floorMetaColor": "rgba(0, 0, 0, 0.6)"
"floorMetaColor": "rgba(0, 0, 0, 0.6)",
"qrcodeBg": "rgba(255, 255, 255, 0.8)",
"qrcodeTextColor": "rgba(0, 0, 0, 0.8)"
}, },
"food": { "food": {
"background": "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 100%)", "background": "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 100%)",

3
src/views/Guide/grid.svg

@ -1,3 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3 3H11V11H3V3ZM3 13H11V21H3V13ZM13 3H21V11H13V3ZM13 13H21V21H13V13ZM15 5V9H19V5H15ZM15 15V19H19V15H15ZM5 5V9H9V5H5ZM5 15V19H9V15H5Z" fill="black" fill-opacity="0.4"/>
</svg>

Before

Width:  |  Height:  |  Size: 280 B

3
src/views/Guide/gridActive.svg

@ -1,3 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3 3H11V11H3V3ZM3 13H11V21H3V13ZM13 3H21V11H13V3ZM13 13H21V21H13V13ZM15 5V9H19V5H15ZM15 15V19H19V15H15ZM5 5V9H9V5H5ZM5 15V19H9V15H5Z" fill="black" fill-opacity="0.8"/>
</svg>

Before

Width:  |  Height:  |  Size: 280 B

3
src/views/Guide/row.svg

@ -1,3 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3 4H21V6H3V4ZM3 11H21V13H3V11ZM3 18H21V20H3V18Z" fill="black" fill-opacity="0.4"/>
</svg>

Before

Width:  |  Height:  |  Size: 196 B

3
src/views/Guide/rowActive.svg

@ -1,3 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3 4H21V6H3V4ZM3 11H21V13H3V11ZM3 18H21V20H3V18Z" fill="black" fill-opacity="0.8"/>
</svg>

Before

Width:  |  Height:  |  Size: 196 B

Loading…
Cancel
Save