diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 7af1682..c360643 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -1,10 +1,46 @@ -* { - padding: 0; - margin: 0; - list-style: none; - box-sizing: border-box; +button.sandblasted-blurred { + box-sizing: content-box; + border: 0.4rem solid #fff; + font-family: satoshiMedium; + font-weight: 500; + font-size: 5.5rem; + color: #fff; + background-color: transparent; + position: relative; + overflow: hidden; } -html, -body { +button.sandblasted-blurred::before, +button.sandblasted-blurred::after { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 100%; height: 100%; -} \ No newline at end of file +} +button.sandblasted-blurred::after { + z-index: 0; + backdrop-filter: blur(9.5rem); +} +button.sandblasted-blurred::before { + z-index: 1; + opacity: 0.1; + background: url('@/assets/images/customer_form_bg.png'); +} +button.sandblasted-blurred > span { + z-index: 2; +} +button.sandblasted-blurred:active { + opacity: 0.7; +} +html:root { + --van-dialog-width: 90rem; + --van-dialog-font-size: 5rem; + --van-dialog-header-line-height: 150%; + --van-dialog-message-font-size: 3.5rem; + --van-dialog-message-line-height: 150%; + --van-button-default-font-size: 4rem; + --van-dialog-button-height: 9rem; + --van-dialog-message-padding: 3rem 2.5rem; + --van-dialog-has-title-message-padding-top: 2.5rem; +} diff --git a/src/assets/css/style.less b/src/assets/css/style.less index e69de29..2ba1b6b 100644 --- a/src/assets/css/style.less +++ b/src/assets/css/style.less @@ -0,0 +1,54 @@ +button.sandblasted-blurred { + box-sizing: content-box; + border: 0.4rem solid #fff; + font-family: satoshiMedium; + font-weight: 500; + font-size: 5.5rem; + color: #fff; + background-color: transparent; + position: relative; + overflow: hidden; + + &::before, + &::after { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + } + + &::after { + z-index: 0; + backdrop-filter: blur(9.5rem); + } + + &::before { + z-index: 1; + opacity: 0.1; + background: url('@/assets/images/customer_form_bg.png'); + } + + >span { + z-index: 2; + } + + &:active { + opacity: 0.7; + } +} + + +// vant dialog +html:root { + --van-dialog-width: 90rem; + --van-dialog-font-size: 5rem; + --van-dialog-header-line-height: 150%; + --van-dialog-message-font-size: 3.5rem; + --van-dialog-message-line-height: 150%; + --van-button-default-font-size: 4rem; + --van-dialog-button-height: 9rem; + --van-dialog-message-padding: 3rem 2.5rem; + --van-dialog-has-title-message-padding-top: 2.5rem; +} \ No newline at end of file diff --git a/src/assets/icons/home.svg b/src/assets/icons/home.svg deleted file mode 100644 index 6e4618c..0000000 --- a/src/assets/icons/home.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - diff --git a/src/assets/icons/home_0.svg b/src/assets/icons/home_0.svg new file mode 100644 index 0000000..61430f3 --- /dev/null +++ b/src/assets/icons/home_0.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/icons/home_1.svg b/src/assets/icons/home_1.svg new file mode 100644 index 0000000..f9db240 --- /dev/null +++ b/src/assets/icons/home_1.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/icons/library.svg b/src/assets/icons/library.svg deleted file mode 100644 index 00c0fd4..0000000 --- a/src/assets/icons/library.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - diff --git a/src/assets/icons/library_0.svg b/src/assets/icons/library_0.svg new file mode 100644 index 0000000..2cc58aa --- /dev/null +++ b/src/assets/icons/library_0.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/icons/library_1.svg b/src/assets/icons/library_1.svg new file mode 100644 index 0000000..3255020 --- /dev/null +++ b/src/assets/icons/library_1.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/assets/icons/profile.svg b/src/assets/icons/profile.svg deleted file mode 100644 index c66bf41..0000000 --- a/src/assets/icons/profile.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - diff --git a/src/assets/icons/profile_0.svg b/src/assets/icons/profile_0.svg new file mode 100644 index 0000000..0979b27 --- /dev/null +++ b/src/assets/icons/profile_0.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/icons/profile_1.svg b/src/assets/icons/profile_1.svg new file mode 100644 index 0000000..002433b --- /dev/null +++ b/src/assets/icons/profile_1.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/components/FooterNavigation.vue b/src/components/FooterNavigation.vue index 47609e6..0ccd824 100644 --- a/src/components/FooterNavigation.vue +++ b/src/components/FooterNavigation.vue @@ -1,6 +1,9 @@ @@ -31,7 +44,7 @@ :class="{ active: currentRoute === nav.path }" @click="onNavClick(nav)" > - + {{ nav.label }} @@ -56,9 +69,9 @@ display: flex; flex-direction: column; align-items: center; - &.active > * { - color: #0d99ff; - } + // &.active > * { + // color: #0d99ff; + // } > .label { margin-top: 1.6rem; font-family: satoshiRegular; diff --git a/src/main.ts b/src/main.ts index ed8dfe2..d212212 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,7 +7,12 @@ import 'normalize.css/normalize.css' import './assets/css/style.css' import SvgIcon from "@/components/SvgIcon/index.vue"; import "virtual:svg-icons-register"; + +// vant组件库 import 'vant/lib/index.css' +import { Locale } from 'vant'; +import enUS from 'vant/es/locale/lang/en-US'; +Locale.use('en-US', enUS); import flexible from "./utils/flexible.js"; diff --git a/src/views/Workshop/uploadFace.vue b/src/views/Workshop/uploadFace.vue index 3b17f89..c6b5618 100644 --- a/src/views/Workshop/uploadFace.vue +++ b/src/views/Workshop/uploadFace.vue @@ -51,8 +51,8 @@

- - + +
@@ -69,8 +69,8 @@
- - + +
@@ -98,7 +98,6 @@ justify-content: center; > button { - box-sizing: content-box; width: 40rem; height: 8.3rem; border-radius: 0.7rem; @@ -108,22 +107,6 @@ font-size: 5.5rem; margin: 0 1.8rem; color: #fff; - background-color: transparent; - position: relative; - &::before { - content: ''; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - // opacity: 0.1; - backdrop-filter: blur(9.5rem); - background: url('@/assets/images/customer_form_bg.png'); - } - &:active { - opacity: 0.7; - } } } }