diff --git a/public/css/woff/fontFamily.css b/public/css/woff/fontFamily.css index f733bf7..233c221 100644 --- a/public/css/woff/fontFamily.css +++ b/public/css/woff/fontFamily.css @@ -3,34 +3,34 @@ 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; + 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; + 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; + 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; + 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; + 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/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/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/router/index.ts b/src/router/index.ts index d38ca24..89d96ed 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -34,7 +34,16 @@ const router = createRouter({ 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'), + }, ] }, ] diff --git a/src/utils/flexible.js b/src/utils/flexible.js index 09aa4bb..385519a 100644 --- a/src/utils/flexible.js +++ b/src/utils/flexible.js @@ -19,7 +19,7 @@ let flexible = (designWidth) =>{ // }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/index.vue b/src/views/Workshop/customize/index.vue new file mode 100644 index 0000000..7961a45 --- /dev/null +++ b/src/views/Workshop/customize/index.vue @@ -0,0 +1,191 @@ + + + + + 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 @@ + + + + +