diff --git a/components.d.ts b/components.d.ts index 8820594..dcb10ec 100644 --- a/components.d.ts +++ b/components.d.ts @@ -9,8 +9,10 @@ export {} declare module '@vue/runtime-core' { export interface GlobalComponents { + HeaderTitle: typeof import('./src/components/HeaderTitle.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] + SelectItem: typeof import('./src/components/selectStyle/selectItem.vue')['default'] SvgIcon: typeof import('./src/components/SvgIcon/index.vue')['default'] VanSwipe: typeof import('vant/es')['Swipe'] VanSwipeItem: typeof import('vant/es')['SwipeItem'] diff --git a/index.html b/index.html index ef3fda4..8172a46 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ + Activities diff --git a/public/css/woff/Boska/Boska-Regular.ttf b/public/css/woff/Boska/Boska-Regular.ttf new file mode 100644 index 0000000..8e7fc26 Binary files /dev/null and b/public/css/woff/Boska/Boska-Regular.ttf differ diff --git a/public/css/woff/Boska/Boska-Regular.woff b/public/css/woff/Boska/Boska-Regular.woff new file mode 100644 index 0000000..c2760bd Binary files /dev/null and b/public/css/woff/Boska/Boska-Regular.woff differ diff --git a/public/css/woff/Mazzard/MazzardH-Regular.otf b/public/css/woff/Mazzard/MazzardH-Regular.otf new file mode 100644 index 0000000..931438e Binary files /dev/null and b/public/css/woff/Mazzard/MazzardH-Regular.otf differ diff --git a/public/css/woff/Poppins/Poppins-Black.otf b/public/css/woff/Poppins/Poppins-Black.otf deleted file mode 100644 index ff6f985..0000000 Binary files a/public/css/woff/Poppins/Poppins-Black.otf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-Black.ttf b/public/css/woff/Poppins/Poppins-Black.ttf deleted file mode 100644 index a9520b7..0000000 Binary files a/public/css/woff/Poppins/Poppins-Black.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-BlackItalic.ttf b/public/css/woff/Poppins/Poppins-BlackItalic.ttf deleted file mode 100644 index ebfdd70..0000000 Binary files a/public/css/woff/Poppins/Poppins-BlackItalic.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-Bold.ttf b/public/css/woff/Poppins/Poppins-Bold.ttf deleted file mode 100644 index bf3bda5..0000000 Binary files a/public/css/woff/Poppins/Poppins-Bold.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-BoldItalic.ttf b/public/css/woff/Poppins/Poppins-BoldItalic.ttf deleted file mode 100644 index e2e6445..0000000 Binary files a/public/css/woff/Poppins/Poppins-BoldItalic.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-ExtraBold.ttf b/public/css/woff/Poppins/Poppins-ExtraBold.ttf deleted file mode 100644 index 8f008c3..0000000 Binary files a/public/css/woff/Poppins/Poppins-ExtraBold.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-ExtraBoldItalic.ttf b/public/css/woff/Poppins/Poppins-ExtraBoldItalic.ttf deleted file mode 100644 index b2a9bf5..0000000 Binary files a/public/css/woff/Poppins/Poppins-ExtraBoldItalic.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-ExtraLight.ttf b/public/css/woff/Poppins/Poppins-ExtraLight.ttf deleted file mode 100644 index ee62382..0000000 Binary files a/public/css/woff/Poppins/Poppins-ExtraLight.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-ExtraLightItalic.ttf b/public/css/woff/Poppins/Poppins-ExtraLightItalic.ttf deleted file mode 100644 index e392492..0000000 Binary files a/public/css/woff/Poppins/Poppins-ExtraLightItalic.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-Italic.ttf b/public/css/woff/Poppins/Poppins-Italic.ttf deleted file mode 100644 index 4620399..0000000 Binary files a/public/css/woff/Poppins/Poppins-Italic.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-Light.ttf b/public/css/woff/Poppins/Poppins-Light.ttf deleted file mode 100644 index 59118ed..0000000 Binary files a/public/css/woff/Poppins/Poppins-Light.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-LightItalic.ttf b/public/css/woff/Poppins/Poppins-LightItalic.ttf deleted file mode 100644 index 6f9279d..0000000 Binary files a/public/css/woff/Poppins/Poppins-LightItalic.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-Medium.ttf b/public/css/woff/Poppins/Poppins-Medium.ttf deleted file mode 100644 index 6ef18f0..0000000 Binary files a/public/css/woff/Poppins/Poppins-Medium.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-MediumItalic.ttf b/public/css/woff/Poppins/Poppins-MediumItalic.ttf deleted file mode 100644 index d8a251c..0000000 Binary files a/public/css/woff/Poppins/Poppins-MediumItalic.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-Regular.ttf b/public/css/woff/Poppins/Poppins-Regular.ttf deleted file mode 100644 index 4202210..0000000 Binary files a/public/css/woff/Poppins/Poppins-Regular.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-SemiBold.ttf b/public/css/woff/Poppins/Poppins-SemiBold.ttf deleted file mode 100644 index 823fa0a..0000000 Binary files a/public/css/woff/Poppins/Poppins-SemiBold.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-SemiBoldItalic.ttf b/public/css/woff/Poppins/Poppins-SemiBoldItalic.ttf deleted file mode 100644 index 29d5f74..0000000 Binary files a/public/css/woff/Poppins/Poppins-SemiBoldItalic.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-Thin.ttf b/public/css/woff/Poppins/Poppins-Thin.ttf deleted file mode 100644 index f5c0fdd..0000000 Binary files a/public/css/woff/Poppins/Poppins-Thin.ttf and /dev/null differ diff --git a/public/css/woff/Poppins/Poppins-ThinItalic.ttf b/public/css/woff/Poppins/Poppins-ThinItalic.ttf deleted file mode 100644 index b910089..0000000 Binary files a/public/css/woff/Poppins/Poppins-ThinItalic.ttf and /dev/null differ diff --git a/public/css/woff/Roboto/Roboto-Bold.ttf b/public/css/woff/Roboto/Roboto-Bold.ttf new file mode 100644 index 0000000..d998cf5 Binary files /dev/null and b/public/css/woff/Roboto/Roboto-Bold.ttf differ diff --git a/public/css/woff/Roboto/Roboto-Regular.ttf b/public/css/woff/Roboto/Roboto-Regular.ttf new file mode 100644 index 0000000..2b6392f Binary files /dev/null and b/public/css/woff/Roboto/Roboto-Regular.ttf differ diff --git a/public/css/woff/Satoshi/Satoshi-Bold.ttf b/public/css/woff/Satoshi/Satoshi-Bold.ttf new file mode 100644 index 0000000..00bc985 Binary files /dev/null and b/public/css/woff/Satoshi/Satoshi-Bold.ttf differ diff --git a/public/css/woff/Satoshi/Satoshi-Bold.woff b/public/css/woff/Satoshi/Satoshi-Bold.woff new file mode 100644 index 0000000..bba8257 Binary files /dev/null and b/public/css/woff/Satoshi/Satoshi-Bold.woff differ diff --git a/public/css/woff/Satoshi/Satoshi-Regular.ttf b/public/css/woff/Satoshi/Satoshi-Regular.ttf new file mode 100644 index 0000000..fe85cd6 Binary files /dev/null and b/public/css/woff/Satoshi/Satoshi-Regular.ttf differ diff --git a/public/css/woff/Satoshi/Satoshi-Regular.woff b/public/css/woff/Satoshi/Satoshi-Regular.woff new file mode 100644 index 0000000..03ac195 Binary files /dev/null and b/public/css/woff/Satoshi/Satoshi-Regular.woff differ diff --git a/public/css/woff/fontFamily.css b/public/css/woff/fontFamily.css new file mode 100644 index 0000000..233c221 --- /dev/null +++ b/public/css/woff/fontFamily.css @@ -0,0 +1,36 @@ +/* cyrillic-ext */ +@font-face { + font-family: 'satoshiRegular'; + font-style: italic; + font-weight: 700; + src: url("./Satoshi/Satoshi-Regular.ttf") format('woff2'), url("./Satoshi/Satoshi-Regular.woff") format('woff2'); + /* unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; */ +} +@font-face { + font-family: 'satoshiBold'; + font-style: italic; + font-weight: 700; + src: url("./Satoshi/Satoshi-Bold.ttf") format('woff2'), url("./Satoshi/Satoshi-Bold.woff") format('woff2'); + /* unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; */ +} +@font-face { + font-family: 'mazzardHRegular'; + font-style: italic; + font-weight: 700; + src: url("./Mazzard/MazzardH-Regular.otf") format('opentype'); + /* unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; */ +} +@font-face { + font-family: 'robotoBold'; + font-style: italic; + font-weight: 700; + src: url("./Roboto/Roboto-Bold.ttf") format('woff2'); + /* unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; */ +} +@font-face { + font-family: 'boskaRegular'; + font-style: italic; + font-weight: 700; + src: url("./Boska/Boska-Regular.ttf") format('woff2'), url("./Boska/Boska-Regular.woff") format('woff2'); + /* unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; */ +} \ No newline at end of file diff --git a/public/css/woff/poppins.css b/public/css/woff/poppins.css deleted file mode 100644 index 366ebe2..0000000 --- a/public/css/woff/poppins.css +++ /dev/null @@ -1,29 +0,0 @@ -/* cyrillic-ext */ -@font-face { - font-family: 'poppinsRegular'; - font-style: italic; - font-weight: 700; - src: url(./Poppins/Poppins-Regular.ttf) format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -@font-face { - font-family: 'poppinsSemiBold'; - font-style: italic; - font-weight: 700; - src: url(./Poppins/Poppins-SemiBold.ttf) format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -@font-face { - font-family: 'poppinsBold'; - font-style: italic; - font-weight: 700; - src: url(./Poppins/Poppins-Bold.ttf) format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -@font-face { - font-family: 'poppinsMedium'; - font-style: italic; - font-weight: 700; - src: url(./Poppins/Poppins-Medium.ttf) format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} \ No newline at end of file diff --git a/src/assets/icons/Return.svg b/src/assets/icons/Return.svg new file mode 100644 index 0000000..7886d7a --- /dev/null +++ b/src/assets/icons/Return.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/add.svg b/src/assets/icons/add.svg new file mode 100644 index 0000000..93f7e3e --- /dev/null +++ b/src/assets/icons/add.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/confirmation.svg b/src/assets/icons/confirmation.svg new file mode 100644 index 0000000..b7b0165 --- /dev/null +++ b/src/assets/icons/confirmation.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/delete.svg b/src/assets/icons/delete.svg new file mode 100644 index 0000000..e040445 --- /dev/null +++ b/src/assets/icons/delete.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/icons/like.svg b/src/assets/icons/like.svg new file mode 100644 index 0000000..b13d3e0 --- /dev/null +++ b/src/assets/icons/like.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/modelSelected.svg b/src/assets/icons/modelSelected.svg new file mode 100644 index 0000000..7056127 --- /dev/null +++ b/src/assets/icons/modelSelected.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/icons/Vector.svg b/src/assets/icons/noLike.svg similarity index 100% rename from src/assets/icons/Vector.svg rename to src/assets/icons/noLike.svg diff --git a/src/assets/icons/update.svg b/src/assets/icons/update.svg new file mode 100644 index 0000000..78cfefe --- /dev/null +++ b/src/assets/icons/update.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/workshop/bg/end_bg.png b/src/assets/images/workshop/bg/end_bg.png new file mode 100644 index 0000000..f5f9fba Binary files /dev/null and b/src/assets/images/workshop/bg/end_bg.png differ diff --git a/src/assets/images/workshop/bg/picture_bg.png b/src/assets/images/workshop/bg/picture_bg.png new file mode 100644 index 0000000..bdf81bb Binary files /dev/null and b/src/assets/images/workshop/bg/picture_bg.png differ diff --git a/src/assets/images/workshop/bg/upload_bg.png b/src/assets/images/workshop/bg/upload_bg.png new file mode 100644 index 0000000..2271943 Binary files /dev/null and b/src/assets/images/workshop/bg/upload_bg.png differ diff --git a/src/components/HeaderTitle.vue b/src/components/HeaderTitle.vue new file mode 100644 index 0000000..51644be --- /dev/null +++ b/src/components/HeaderTitle.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue index 791e66d..e00e238 100644 --- a/src/components/SvgIcon/index.vue +++ b/src/components/SvgIcon/index.vue @@ -38,6 +38,7 @@ const svgClass = computed(() => { width: 1em; height: 1em; fill: currentColor; + color: var(--svg-icon-color); } .c-svg { width: 100%; diff --git a/src/components/selectStyle/selectItem.vue b/src/components/selectStyle/selectItem.vue new file mode 100644 index 0000000..1935e3e --- /dev/null +++ b/src/components/selectStyle/selectItem.vue @@ -0,0 +1,121 @@ + + + \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index 1806c61..afd7dea 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -7,6 +7,19 @@ const router = createRouter({ path: '/', redirect: '/workshop' }, + { + path: '/login', + component: () => import('@/views/login/LoginPage.vue') + }, + { + path: '/signup', + component: () => import('@/views/login/SignupPage.vue') + }, + { path: '/welcome', component: () => import('@/views/login/WelcomePage.vue') }, + { + path: '/stylist', + component: () => import('@/views/stylist/index.vue') + }, { path: '/workshop', name: 'Workshop', @@ -22,21 +35,29 @@ const router = createRouter({ path: '/workshop/selectStyle', name: 'SelectStyle', component: () => import('../views/Workshop/selectStyle.vue') + }, + { + path: '/workshop/selectModel', + name: 'SelectModel', + component: () => import('../views/Workshop/selectModel.vue') + }, + { + path: '/workshop/selectModelContinue', + name: 'SelectModelContinue', + component: () => import('../views/Workshop/selectModelContinue.vue') + }, + + { + path: '/workshop/uploadFace', + name: 'uploadFace', + component: () => import('../views/Workshop/uploadFace/index.vue') + }, + { + path: '/workshop/customize', + name: 'customize', + component: () => import('../views/Workshop/customize/index.vue') } ] - }, - { - path: '/login', - component: () => import('@/views/login/LoginPage.vue') - }, - { - path: '/signup', - component: () => import('@/views/login/SignupPage.vue') - }, - { path: '/welcome', component: () => import('@/views/login/WelcomePage.vue') }, - { - path:'/stylist', - component: () => import('@/views/stylist/index.vue') } ] }) diff --git a/src/utils/flexible.js b/src/utils/flexible.js index 4594585..385519a 100644 --- a/src/utils/flexible.js +++ b/src/utils/flexible.js @@ -1,6 +1,6 @@ import { getUniversalZoomLevel } from '@/utils/tools' -let flexible = (designWidth, maxWidth,minWidth) =>{ +let flexible = (designWidth) =>{ var doc = document, win = window, docEl = doc.documentElement, remStyle = document.createElement("style"), tid; designWidth = designWidth || 1080; // maxWidth = maxWidth || 1920; @@ -19,7 +19,7 @@ let flexible = (designWidth, maxWidth,minWidth) =>{ // }else{ // designWidth = 375 // } - var rem = Math.round(width * 10 / designWidth); + var rem = (width * 10 / designWidth).toFixed(2); docEl.style.fontSize = rem+'px' remStyle.innerHTML = 'html{font-size:' + rem + 'px;}'; } diff --git a/src/views/Workshop/customize/home.vue b/src/views/Workshop/customize/home.vue new file mode 100644 index 0000000..14983fb --- /dev/null +++ b/src/views/Workshop/customize/home.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/views/Workshop/customize/index.vue b/src/views/Workshop/customize/index.vue new file mode 100644 index 0000000..12e9e09 --- /dev/null +++ b/src/views/Workshop/customize/index.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/views/Workshop/index.vue b/src/views/Workshop/index.vue index a5cc1f7..5a72c07 100644 --- a/src/views/Workshop/index.vue +++ b/src/views/Workshop/index.vue @@ -23,5 +23,6 @@ const {} = toRefs(data); width: 100%; height: 100%; position: relative; + font-family: 'satoshiRegular'; } \ No newline at end of file diff --git a/src/views/Workshop/selectModel.vue b/src/views/Workshop/selectModel.vue new file mode 100644 index 0000000..6c0db5c --- /dev/null +++ b/src/views/Workshop/selectModel.vue @@ -0,0 +1,129 @@ + + + \ No newline at end of file diff --git a/src/views/Workshop/selectModelContinue.vue b/src/views/Workshop/selectModelContinue.vue new file mode 100644 index 0000000..344cecb --- /dev/null +++ b/src/views/Workshop/selectModelContinue.vue @@ -0,0 +1,118 @@ + + + \ No newline at end of file diff --git a/src/views/Workshop/selectStyle.vue b/src/views/Workshop/selectStyle.vue index 6cdafed..6e48c9c 100644 --- a/src/views/Workshop/selectStyle.vue +++ b/src/views/Workshop/selectStyle.vue @@ -1,23 +1,78 @@ @@ -26,5 +81,26 @@ const {} = toRefs(data); width: 100%; height: 100%; position: relative; + > .text{ + text-align: center; + width: 100%; + margin-top: 7rem; + margin-bottom: 4.8rem; + > .title{ + font-family: satoshiBold; + font-weight: 700; + font-size: 9.6rem; + line-height: 124%; + } + > .info{ + font-size: 4rem; + font-weight: 400; + line-height: 124%; + margin-top: 1.3rem; + } + } + .selectContent{ + padding: 0 4rem; + } } \ No newline at end of file diff --git a/src/views/Workshop/uploadFace/index.vue b/src/views/Workshop/uploadFace/index.vue new file mode 100644 index 0000000..78881aa --- /dev/null +++ b/src/views/Workshop/uploadFace/index.vue @@ -0,0 +1,195 @@ + + + + +