diff --git a/src/assets/icons/setting.svg b/src/assets/icons/setting.svg new file mode 100644 index 0000000..4273101 --- /dev/null +++ b/src/assets/icons/setting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/dress_for_bg.png b/src/assets/images/dress_for_bg.png new file mode 100644 index 0000000..eda1a50 Binary files /dev/null and b/src/assets/images/dress_for_bg.png differ diff --git a/src/assets/images/has_shouder_bg.png b/src/assets/images/has_shouder_bg.png new file mode 100644 index 0000000..9738b75 Binary files /dev/null and b/src/assets/images/has_shouder_bg.png differ diff --git a/src/assets/images/no_shouder_bg.png b/src/assets/images/no_shouder_bg.png new file mode 100644 index 0000000..cd92996 Binary files /dev/null and b/src/assets/images/no_shouder_bg.png differ diff --git a/src/assets/images/sex_select_bg.png b/src/assets/images/sex_select_bg.png new file mode 100644 index 0000000..c751655 Binary files /dev/null and b/src/assets/images/sex_select_bg.png differ diff --git a/src/assets/main.css b/src/assets/main.css index 78bb472..91768ca 100644 --- a/src/assets/main.css +++ b/src/assets/main.css @@ -25,6 +25,37 @@ a, padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); } + +.flex{ + display: flex; +} +.flex-column{ + flex-direction: column; +} +.flex-1{ + flex: 1; +} +.flex-center{ + align-items: center; + justify-content: center; +} +.flex-align-center{ + align-items: center; +} +.flex-justify-center{ + justify-content: center; +} +.flex-around{ + justify-content: space-around; +} +.flex-between{ + justify-content: space-between; +} +.flex-evenly{ + justify-content: space-evenly; +} + + /* @media (min-width: 1024px) { body { display: flex; diff --git a/src/router/index.ts b/src/router/index.ts index 98d15b3..d088aa6 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -9,17 +9,42 @@ const router = createRouter({ }, { path: '/login', + name: 'LoginPage', component: () => import('@/views/login/LoginPage.vue') }, { path: '/signup', + name: 'SignupPage', component: () => import('@/views/login/SignupPage.vue') }, - { path: '/welcome', component: () => import('@/views/login/WelcomePage.vue') }, + { + path: '/welcome', + name: 'WelcomePage', + component: () => import('@/views/login/WelcomePage.vue') + }, { path: '/stylist', - component: () => import('@/views/stylist/index.vue') + name: 'StylistPage', + component: () => import('@/views/stylist/index.vue'), + children: [ + { + path: '/sex', + name:'sex' + component: () => import('@/views/stylist/sex.vue') + }, + { + path: '/dressfor', + name:'dressfor' + component: () => import('@/views/stylist/dressfor.vue') + }, + { + path: '/customer', + name:'customer', + component: () => import('@/views/stylist/customer.vue') + } + ] }, + { path: '/workshop', name: 'Workshop', @@ -46,38 +71,41 @@ const router = createRouter({ 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'), - children: [ - { - path: '/workshop/customize/home', - name: 'customizeHome', - component: () => import('../views/Workshop/customize/home.vue'), - }, - { - path: '/workshop/customize/library', - name: 'customizeLibrary', - component: () => import('../views/Workshop/customize/library.vue'), - }, - { - path: '/workshop/customize/creation', - name: 'customizeCreation', - component: () => import('../views/Workshop/customize/creation.vue'), - }, - ], - }, - {// 完成创建 - path: '/workshop/end', - name: 'end', - component: () => import('../views/Workshop/end/index.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'), + children: [ + { + path: '/workshop/customize/home', + name: 'customizeHome', + component: () => import('../views/Workshop/customize/home.vue') + }, + { + path: '/workshop/customize/library', + name: 'customizeLibrary', + component: () => import('../views/Workshop/customize/library.vue') + }, + { + path: '/workshop/customize/creation', + name: 'customizeCreation', + component: () => import('../views/Workshop/customize/creation.vue') + } + ] + }, + { + // 完成创建 + path: '/workshop/end', + name: 'end', + component: () => import('../views/Workshop/end/index.vue') + } ] } ] diff --git a/src/views/login/LoginPage.vue b/src/views/login/LoginPage.vue index 678c013..7942132 100644 --- a/src/views/login/LoginPage.vue +++ b/src/views/login/LoginPage.vue @@ -291,6 +291,7 @@ const handlePasswordInput = () => { .header { margin-bottom: 4rem; color: white; + font-family: 'satoshiRegular'; } .title { diff --git a/src/views/login/WelcomePage.vue b/src/views/login/WelcomePage.vue index 59534a0..df20f12 100644 --- a/src/views/login/WelcomePage.vue +++ b/src/views/login/WelcomePage.vue @@ -39,12 +39,12 @@ const goToSignup = () => { font-weight: 400; padding-bottom: 20rem; .title{ - font-family: Boska; + font-family: 'boskaRegular'; line-height: 7.55rem; } .subtitle{ font-size: 3rem; - font-family: Satoshi; + font-family: 'satoshiRegular'; margin: 2rem 0; } .sign-btn{ diff --git a/src/views/stylist/components/Video.vue b/src/views/stylist/components/Video.vue new file mode 100644 index 0000000..f1aaf57 --- /dev/null +++ b/src/views/stylist/components/Video.vue @@ -0,0 +1,260 @@ + + + + + diff --git a/src/views/stylist/customer.vue b/src/views/stylist/customer.vue new file mode 100644 index 0000000..4020324 --- /dev/null +++ b/src/views/stylist/customer.vue @@ -0,0 +1,74 @@ + + + diff --git a/src/views/stylist/dressfor.vue b/src/views/stylist/dressfor.vue new file mode 100644 index 0000000..9ac82e8 --- /dev/null +++ b/src/views/stylist/dressfor.vue @@ -0,0 +1,45 @@ + + + diff --git a/src/views/stylist/index.vue b/src/views/stylist/index.vue index 413a163..35b2665 100644 --- a/src/views/stylist/index.vue +++ b/src/views/stylist/index.vue @@ -22,9 +22,9 @@ - + -
+
{{ item.name }}
@@ -52,17 +52,31 @@
Continue
+ +
+ +
+
diff --git a/src/views/stylist/sex.vue b/src/views/stylist/sex.vue new file mode 100644 index 0000000..3c0c60c --- /dev/null +++ b/src/views/stylist/sex.vue @@ -0,0 +1,66 @@ + + +