diff --git a/src/base/ShopItem/ShopItem.vue b/src/base/ShopItem/ShopItem.vue index 2e6d224..940f07c 100644 --- a/src/base/ShopItem/ShopItem.vue +++ b/src/base/ShopItem/ShopItem.vue @@ -22,7 +22,13 @@
-
+
store.SET_SHOP(null) height: 300px; left: 391px; 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); backdrop-filter: blur(7px); border-radius: var(--global-radius, 12px); @@ -261,7 +267,7 @@ const deactivate = () => store.SET_SHOP(null) height: 56px; right: 8px; top: 8px; - background: center / cover no-repeat url(./close.png); + background: center / cover no-repeat; } .qrcode { width: 150px; @@ -277,7 +283,7 @@ const deactivate = () => store.SET_SHOP(null) line-height: 23px; text-align: center; margin-top: 27px; - color: rgba(0, 0, 0, 0.8); + color: var(--brand-qrcodeTextColor, rgba(0, 0, 0, 0.8)); } } } diff --git a/src/base/ShopItem/close.png b/src/base/ShopItem/close.png deleted file mode 100644 index a170641..0000000 Binary files a/src/base/ShopItem/close.png and /dev/null differ diff --git a/src/themes/business/brandQrcodeClose.png b/src/themes/business/brandQrcodeClose.png new file mode 100644 index 0000000..cec0bf8 Binary files /dev/null and b/src/themes/business/brandQrcodeClose.png differ diff --git a/src/themes/business/style.json b/src/themes/business/style.json index 1a87982..63e9b80 100644 --- a/src/themes/business/style.json +++ b/src/themes/business/style.json @@ -63,7 +63,9 @@ "color": "rgba(0, 0, 0, 0.8)", "metaColor": "rgba(0, 0, 0, 0.6)", "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": { "background": "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 100%)", diff --git a/src/themes/dark/brandQrcodeClose.png b/src/themes/dark/brandQrcodeClose.png new file mode 100644 index 0000000..a083229 Binary files /dev/null and b/src/themes/dark/brandQrcodeClose.png differ diff --git a/src/themes/dark/grid.png b/src/themes/dark/grid.png index 098b5cf..5d63797 100644 Binary files a/src/themes/dark/grid.png and b/src/themes/dark/grid.png differ diff --git a/src/themes/dark/gridActive.png b/src/themes/dark/gridActive.png index 368f960..43f92fe 100644 Binary files a/src/themes/dark/gridActive.png and b/src/themes/dark/gridActive.png differ diff --git a/src/themes/dark/row.png b/src/themes/dark/row.png index e310d9d..2f389d5 100644 Binary files a/src/themes/dark/row.png and b/src/themes/dark/row.png differ diff --git a/src/themes/dark/rowActive.png b/src/themes/dark/rowActive.png index a9a6359..008fec9 100644 Binary files a/src/themes/dark/rowActive.png and b/src/themes/dark/rowActive.png differ diff --git a/src/themes/dark/style.json b/src/themes/dark/style.json index 07db1ae..e2c1ce8 100644 --- a/src/themes/dark/style.json +++ b/src/themes/dark/style.json @@ -63,7 +63,9 @@ "color": "#FFFFFF", "metaColor": "rgba(255, 255, 255, 0.6)", "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": { "background": "linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.2) 100%)", diff --git a/src/themes/fashion/brandQrcodeClose.png b/src/themes/fashion/brandQrcodeClose.png new file mode 100644 index 0000000..c765160 Binary files /dev/null and b/src/themes/fashion/brandQrcodeClose.png differ diff --git a/src/themes/fashion/style.json b/src/themes/fashion/style.json index 6eb28bd..33eba67 100644 --- a/src/themes/fashion/style.json +++ b/src/themes/fashion/style.json @@ -63,7 +63,9 @@ "color": "rgba(0, 0, 0, 0.8)", "metaColor": "rgba(0, 0, 0, 0.6)", "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": { "background": "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 100%)", diff --git a/src/themes/highend/brandQrcodeClose.png b/src/themes/highend/brandQrcodeClose.png new file mode 100644 index 0000000..310d3e8 Binary files /dev/null and b/src/themes/highend/brandQrcodeClose.png differ diff --git a/src/themes/highend/style.json b/src/themes/highend/style.json index 99988f6..1ef8355 100644 --- a/src/themes/highend/style.json +++ b/src/themes/highend/style.json @@ -63,7 +63,9 @@ "color": "rgba(0, 0, 0, 0.8)", "metaColor": "rgba(0, 0, 0, 0.6)", "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": { "background": "linear-gradient(180deg, rgba(219, 194, 161, 0) 0%, #DBC2A1 100%, #DBC2A1 100%)", diff --git a/src/themes/luxury/brandQrcodeClose.png b/src/themes/luxury/brandQrcodeClose.png new file mode 100644 index 0000000..ef2cd1c Binary files /dev/null and b/src/themes/luxury/brandQrcodeClose.png differ diff --git a/src/themes/luxury/style.json b/src/themes/luxury/style.json index bcbc4ce..0920a77 100644 --- a/src/themes/luxury/style.json +++ b/src/themes/luxury/style.json @@ -63,7 +63,9 @@ "color": "rgba(0, 0, 0, 0.8)", "metaColor": "rgba(0, 0, 0, 0.6)", "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": { "background": "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 100%)", diff --git a/src/themes/main/billboardLoc.png b/src/themes/main/billboardLoc.png deleted file mode 100644 index eb3e38c..0000000 Binary files a/src/themes/main/billboardLoc.png and /dev/null differ diff --git a/src/themes/main/brandQrcodeClose.png b/src/themes/main/brandQrcodeClose.png new file mode 100644 index 0000000..c765160 Binary files /dev/null and b/src/themes/main/brandQrcodeClose.png differ diff --git a/src/themes/main/style.json b/src/themes/main/style.json index 514369e..6a2ce7b 100644 --- a/src/themes/main/style.json +++ b/src/themes/main/style.json @@ -63,7 +63,9 @@ "color": "rgba(0, 0, 0, 0.8)", "metaColor": "rgba(0, 0, 0, 0.6)", "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": { "background": "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 100%)", diff --git a/src/views/Guide/grid.svg b/src/views/Guide/grid.svg deleted file mode 100644 index f40e598..0000000 --- a/src/views/Guide/grid.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/views/Guide/gridActive.svg b/src/views/Guide/gridActive.svg deleted file mode 100644 index a2ed671..0000000 --- a/src/views/Guide/gridActive.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/views/Guide/row.svg b/src/views/Guide/row.svg deleted file mode 100644 index 8f08ec9..0000000 --- a/src/views/Guide/row.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/views/Guide/rowActive.svg b/src/views/Guide/rowActive.svg deleted file mode 100644 index c2eb7ab..0000000 --- a/src/views/Guide/rowActive.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -