huangmh
/
client_iot-daoshi-template-v
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feat: 增加店铺字体颜色、缀语、美食缀语字体颜色字段

v1.0.1
jiannibang 4 years ago
parent
4df393c347
commit
fcc9c4eb96
8 changed files with 32 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/base/ShopItem/ShopItem.vue
  2. 5
      src/components/SearchResultItem/SearchResultItem.vue
  3. 5
      src/themes/business/style.json
  4. 9
      src/themes/dark/style.json
  5. 5
      src/themes/fashion/style.json
  6. 5
      src/themes/highend/style.json
  7. 5
      src/themes/luxury/style.json
  8. 5
      src/themes/main/style.json

7
src/base/ShopItem/ShopItem.vue
View File

@ -88,7 +88,7 @@ const deactivate = () => store.SET_SHOP(null)
font-weight: 700; font-weight: 700;
font-size: 14px; font-size: 14px;
line-height: 16px; line-height: 16px;
color: rgba(0, 0, 0, 0.8);
color: var(--brand-color, rgba(0, 0, 0, 0.8));
flex: 1; flex: 1;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
@ -101,7 +101,7 @@ const deactivate = () => store.SET_SHOP(null)
font-size: 12px; font-size: 12px;
line-height: 14px; line-height: 14px;
font-family: 'font_bold'; font-family: 'font_bold';
color: rgba(0, 0, 0, 0.4);
color: var(--brand-metaColor, rgba(0, 0, 0, 0.4));
} }
.dir { .dir {
width: 20px; width: 20px;
@ -130,7 +130,6 @@ const deactivate = () => store.SET_SHOP(null)
font-weight: 700; font-weight: 700;
font-size: 18px; font-size: 18px;
line-height: 21px; line-height: 21px;
color: rgba(0, 0, 0, 0.8);
} }
.name-right { .name-right {
font-weight: 500; font-weight: 500;
@ -182,7 +181,7 @@ const deactivate = () => store.SET_SHOP(null)
font-weight: 700; font-weight: 700;
font-size: 14px; font-size: 14px;
line-height: 17px; 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; margin-top: 6px;
} }
} }

5
src/components/SearchResultItem/SearchResultItem.vue
View File

@ -36,7 +36,7 @@ function handleShop() {
align-items: center; align-items: center;
width: 210px; width: 210px;
height: 200px; height: 200px;
background: rgba(255, 255, 255, 0.6);
background: var(--brand-background);
border-radius: var(--global-radius, 8px); border-radius: var(--global-radius, 8px);
margin-right: 8px; margin-right: 8px;
margin-top: 24px; margin-top: 24px;
@ -66,17 +66,18 @@ function handleShop() {
font-weight: 700; font-weight: 700;
font-size: 14px; font-size: 14px;
line-height: 16px; line-height: 16px;
color: rgba(0, 0, 0, 0.8);
} }
.left { .left {
flex: 1; flex: 1;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: var(--brand-color);
} }
.right { .right {
width: 40px; width: 40px;
text-align: right; text-align: right;
color: var(--brand-metaColor);
} }
} }
} }

5
src/themes/business/style.json
View File

@ -60,11 +60,14 @@
}, },
"brand": { "brand": {
"background": "rgba(255, 255, 255, 0.6)", "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)", "floorNameColor": "rgba(0, 0, 0, 0.8)",
"floorMetaColor": "rgba(0, 0, 0, 0.6)" "floorMetaColor": "rgba(0, 0, 0, 0.6)"
}, },
"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%)",
"metaColor": "rgba(0, 0, 0, 0.6)"
}, },
"carousel": { "carousel": {
"titleColor": "rgba(0, 0, 0, 0.8)", "titleColor": "rgba(0, 0, 0, 0.8)",

9
src/themes/dark/style.json
View File

@ -51,8 +51,8 @@
"guideBorder": "none", "guideBorder": "none",
"guideTopBg": "linear-gradient(180deg, #3A6EE2 0%, #72C1ED 100%)", "guideTopBg": "linear-gradient(180deg, #3A6EE2 0%, #72C1ED 100%)",
"guideQrcodeBg": "rgba(255, 255, 255, 0.2)", "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%)", "foodBg": "linear-gradient(180deg, #1D1D22 0%, #6D719C 100%)",
"foodBorder": "none", "foodBorder": "none",
"recBg": "linear-gradient(180deg, #1D1D22 0%, #6D719C 100%)", "recBg": "linear-gradient(180deg, #1D1D22 0%, #6D719C 100%)",
@ -60,11 +60,14 @@
}, },
"brand": { "brand": {
"background": "rgba(0, 0, 0, 0.2)", "background": "rgba(0, 0, 0, 0.2)",
"color": "#FFFFFF",
"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)"
}, },
"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%)",
"metaColor": "rgba(255, 255, 255, 0.4)"
}, },
"carousel": { "carousel": {
"titleColor": "#FFFFFF", "titleColor": "#FFFFFF",

5
src/themes/fashion/style.json
View File

@ -60,11 +60,14 @@
}, },
"brand": { "brand": {
"background": "rgba(255, 255, 255, 0.6)", "background": "rgba(255, 255, 255, 0.6)",
"color": "rgba(0, 0, 0, 0.8)",
"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)"
}, },
"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%)",
"metaColor": "rgba(0, 0, 0, 0.6)"
}, },
"carousel": { "carousel": {
"titleColor": "#fff", "titleColor": "#fff",

5
src/themes/highend/style.json
View File

@ -60,11 +60,14 @@
}, },
"brand": { "brand": {
"background": "linear-gradient(90deg, #BA9B7A 0%, #DBC2A1 100%)", "background": "linear-gradient(90deg, #BA9B7A 0%, #DBC2A1 100%)",
"color": "rgba(0, 0, 0, 0.8)",
"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)"
}, },
"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%)",
"metaColor": "rgba(0, 0, 0, 0.6)"
}, },
"carousel": { "carousel": {
"titleColor": "#fff", "titleColor": "#fff",

5
src/themes/luxury/style.json
View File

@ -60,11 +60,14 @@
}, },
"brand": { "brand": {
"background": "rgba(255, 255, 255, 0.6)", "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)", "floorNameColor": "rgba(0, 0, 0, 0.8)",
"floorMetaColor": "rgba(0, 0, 0, 0.6)" "floorMetaColor": "rgba(0, 0, 0, 0.6)"
}, },
"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%)",
"metaColor": "rgba(0, 0, 0, 0.6)"
}, },
"carousel": { "carousel": {
"titleColor": "rgba(0, 0, 0, 0.8)", "titleColor": "rgba(0, 0, 0, 0.8)",

5
src/themes/main/style.json
View File

@ -60,11 +60,14 @@
}, },
"brand": { "brand": {
"background": "rgba(255, 255, 255, 0.6)", "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)", "floorNameColor": "rgba(0, 0, 0, 0.8)",
"floorMetaColor": "rgba(0, 0, 0, 0.6)" "floorMetaColor": "rgba(0, 0, 0, 0.6)"
}, },
"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%)",
"metaColor": "rgba(0, 0, 0, 0.6)"
}, },
"carousel": { "carousel": {
"titleColor": "rgba(0, 0, 0, 0.8)", "titleColor": "rgba(0, 0, 0, 0.8)",

Write Preview
Loading…
Cancel
Save