From fcc9c4eb96ce3c3ed371b56f01cbf9fb993cc7a5 Mon Sep 17 00:00:00 2001 From: jiannibang <271381693@qq.com> Date: Wed, 28 Dec 2022 15:08:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2=E3=80=81=E7=BC=80=E8=AF=AD?= =?UTF-8?q?=E3=80=81=E7=BE=8E=E9=A3=9F=E7=BC=80=E8=AF=AD=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/ShopItem/ShopItem.vue | 7 +++---- src/components/SearchResultItem/SearchResultItem.vue | 5 +++-- src/themes/business/style.json | 5 ++++- src/themes/dark/style.json | 9 ++++++--- src/themes/fashion/style.json | 5 ++++- src/themes/highend/style.json | 5 ++++- src/themes/luxury/style.json | 5 ++++- src/themes/main/style.json | 5 ++++- 8 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/base/ShopItem/ShopItem.vue b/src/base/ShopItem/ShopItem.vue index 7ded5bd..2e6d224 100644 --- a/src/base/ShopItem/ShopItem.vue +++ b/src/base/ShopItem/ShopItem.vue @@ -88,7 +88,7 @@ const deactivate = () => store.SET_SHOP(null) font-weight: 700; font-size: 14px; line-height: 16px; - color: rgba(0, 0, 0, 0.8); + color: var(--brand-color, rgba(0, 0, 0, 0.8)); flex: 1; white-space: nowrap; overflow: hidden; @@ -101,7 +101,7 @@ const deactivate = () => store.SET_SHOP(null) font-size: 12px; line-height: 14px; font-family: 'font_bold'; - color: rgba(0, 0, 0, 0.4); + color: var(--brand-metaColor, rgba(0, 0, 0, 0.4)); } .dir { width: 20px; @@ -130,7 +130,6 @@ const deactivate = () => store.SET_SHOP(null) font-weight: 700; font-size: 18px; line-height: 21px; - color: rgba(0, 0, 0, 0.8); } .name-right { font-weight: 500; @@ -182,7 +181,7 @@ const deactivate = () => store.SET_SHOP(null) font-weight: 700; font-size: 14px; line-height: 17px; - color: rgba(0, 0, 0, 0.6); + color: var(--food-metaColor, --brand-mataColor, rgba(0, 0, 0, 0.6)); margin-top: 6px; } } diff --git a/src/components/SearchResultItem/SearchResultItem.vue b/src/components/SearchResultItem/SearchResultItem.vue index 7ec450b..553d83c 100644 --- a/src/components/SearchResultItem/SearchResultItem.vue +++ b/src/components/SearchResultItem/SearchResultItem.vue @@ -36,7 +36,7 @@ function handleShop() { align-items: center; width: 210px; height: 200px; - background: rgba(255, 255, 255, 0.6); + background: var(--brand-background); border-radius: var(--global-radius, 8px); margin-right: 8px; margin-top: 24px; @@ -66,17 +66,18 @@ function handleShop() { font-weight: 700; font-size: 14px; line-height: 16px; - color: rgba(0, 0, 0, 0.8); } .left { flex: 1; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + color: var(--brand-color); } .right { width: 40px; text-align: right; + color: var(--brand-metaColor); } } } diff --git a/src/themes/business/style.json b/src/themes/business/style.json index 5a509e6..e1143de 100644 --- a/src/themes/business/style.json +++ b/src/themes/business/style.json @@ -60,11 +60,14 @@ }, "brand": { "background": "rgba(255, 255, 255, 0.6)", + "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)" }, "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%)", + "metaColor": "rgba(0, 0, 0, 0.6)" }, "carousel": { "titleColor": "rgba(0, 0, 0, 0.8)", diff --git a/src/themes/dark/style.json b/src/themes/dark/style.json index 1537fe7..1eeeb25 100644 --- a/src/themes/dark/style.json +++ b/src/themes/dark/style.json @@ -51,8 +51,8 @@ "guideBorder": "none", "guideTopBg": "linear-gradient(180deg, #3A6EE2 0%, #72C1ED 100%)", "guideQrcodeBg": "rgba(255, 255, 255, 0.2)", - "guideColor": "#000000", - "guideMetaColor": "rgba(0, 0, 0, 0.8)", + "guideColor": "#FFFFFF", + "guideMetaColor": "rgba(255, 255, 255, 0.8)", "foodBg": "linear-gradient(180deg, #1D1D22 0%, #6D719C 100%)", "foodBorder": "none", "recBg": "linear-gradient(180deg, #1D1D22 0%, #6D719C 100%)", @@ -60,11 +60,14 @@ }, "brand": { "background": "rgba(0, 0, 0, 0.2)", + "color": "#FFFFFF", + "metaColor": "rgba(255, 255, 255, 0.6)", "floorNameColor": "#FFFFFF", "floorMetaColor": "rgba(255, 255, 255, 0.8)" }, "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%)", + "metaColor": "rgba(255, 255, 255, 0.4)" }, "carousel": { "titleColor": "#FFFFFF", diff --git a/src/themes/fashion/style.json b/src/themes/fashion/style.json index 3886db7..95ea86a 100644 --- a/src/themes/fashion/style.json +++ b/src/themes/fashion/style.json @@ -60,11 +60,14 @@ }, "brand": { "background": "rgba(255, 255, 255, 0.6)", + "color": "rgba(0, 0, 0, 0.8)", + "metaColor": "rgba(0, 0, 0, 0.6)", "floorNameColor": "#fff", "floorMetaColor": "rgba(255, 255, 255, 0.8)" }, "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%)", + "metaColor": "rgba(0, 0, 0, 0.6)" }, "carousel": { "titleColor": "#fff", diff --git a/src/themes/highend/style.json b/src/themes/highend/style.json index 65ac46d..34be7b4 100644 --- a/src/themes/highend/style.json +++ b/src/themes/highend/style.json @@ -60,11 +60,14 @@ }, "brand": { "background": "linear-gradient(90deg, #BA9B7A 0%, #DBC2A1 100%)", + "color": "rgba(0, 0, 0, 0.8)", + "metaColor": "rgba(0, 0, 0, 0.6)", "floorNameColor": "#fff", "floorMetaColor": "rgba(255, 255, 255, 0.8)" }, "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%)", + "metaColor": "rgba(0, 0, 0, 0.6)" }, "carousel": { "titleColor": "#fff", diff --git a/src/themes/luxury/style.json b/src/themes/luxury/style.json index a81820b..f21d92b 100644 --- a/src/themes/luxury/style.json +++ b/src/themes/luxury/style.json @@ -60,11 +60,14 @@ }, "brand": { "background": "rgba(255, 255, 255, 0.6)", + "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)" }, "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%)", + "metaColor": "rgba(0, 0, 0, 0.6)" }, "carousel": { "titleColor": "rgba(0, 0, 0, 0.8)", diff --git a/src/themes/main/style.json b/src/themes/main/style.json index 96618c7..b664271 100644 --- a/src/themes/main/style.json +++ b/src/themes/main/style.json @@ -60,11 +60,14 @@ }, "brand": { "background": "rgba(255, 255, 255, 0.6)", + "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)" }, "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%)", + "metaColor": "rgba(0, 0, 0, 0.6)" }, "carousel": { "titleColor": "rgba(0, 0, 0, 0.8)",