diff --git a/src/assets/icons/home.svg b/src/assets/icons/home.svg new file mode 100644 index 0000000..6e4618c --- /dev/null +++ b/src/assets/icons/home.svg @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/src/assets/icons/library.svg b/src/assets/icons/library.svg new file mode 100644 index 0000000..00c0fd4 --- /dev/null +++ b/src/assets/icons/library.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + diff --git a/src/assets/icons/profile.svg b/src/assets/icons/profile.svg new file mode 100644 index 0000000..c66bf41 --- /dev/null +++ b/src/assets/icons/profile.svg @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/src/components/FooterNavigation.vue b/src/components/FooterNavigation.vue new file mode 100644 index 0000000..47609e6 --- /dev/null +++ b/src/components/FooterNavigation.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/components/HeaderTitle.vue b/src/components/HeaderTitle.vue index b5cc528..4ae827b 100644 --- a/src/components/HeaderTitle.vue +++ b/src/components/HeaderTitle.vue @@ -4,8 +4,8 @@ defineProps({ title: { type: String, default: 'AI STYLING ASSISTANT' }, - light: { type: Boolean,default:false }, - hasSetting: { type: Boolean,default:false } + hasSetting: { type: Boolean, default: false }, + styleType: { type: String, default: '1' },//1低 2高 }) defineEmits(['clickReturn']) @@ -17,49 +17,57 @@ diff --git a/src/router/index.ts b/src/router/index.ts index e36fdbb..0dd4f6a 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -85,36 +85,31 @@ const router = createRouter({ // 上传照片 path: '/workshop/uploadFace', name: 'uploadFace', - component: () => import('../views/Workshop/uploadFace/index.vue') + component: () => import('../views/Workshop/uploadFace.vue') }, { // 自定义创作 path: '/workshop/customize', name: 'customize', - component: () => import('../views/Workshop/customize/index.vue'), - children: [ - { - path: '/workshop/customize', - 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') - } - ] + component: () => import('../views/Workshop/customize.vue'), }, + { + // library + path: '/workshop/library', + name: 'library', + component: () => import('../views/Workshop/library.vue'), + }, + { + // creation + path: '/workshop/creation', + name: 'creation', + component: () => import('../views/Workshop/creation.vue'), + }, { // 完成创建 path: '/workshop/end', name: 'end', - component: () => import('../views/Workshop/end/index.vue') + component: () => import('../views/Workshop/end.vue') } ] } diff --git a/src/views/Workshop/customize/creation.vue b/src/views/Workshop/creation.vue similarity index 59% rename from src/views/Workshop/customize/creation.vue rename to src/views/Workshop/creation.vue index 6bdd2d0..95713fb 100644 --- a/src/views/Workshop/customize/creation.vue +++ b/src/views/Workshop/creation.vue @@ -1,7 +1,15 @@ diff --git a/src/views/Workshop/customize/home.vue b/src/views/Workshop/customize.vue similarity index 88% rename from src/views/Workshop/customize/home.vue rename to src/views/Workshop/customize.vue index 08bce05..72cf8f0 100644 --- a/src/views/Workshop/customize/home.vue +++ b/src/views/Workshop/customize.vue @@ -1,8 +1,11 @@ diff --git a/src/views/Workshop/end/index.vue b/src/views/Workshop/end.vue similarity index 53% rename from src/views/Workshop/end/index.vue rename to src/views/Workshop/end.vue index 3cee985..43df86b 100644 --- a/src/views/Workshop/end/index.vue +++ b/src/views/Workshop/end.vue @@ -1,9 +1,13 @@ \ No newline at end of file diff --git a/src/views/Workshop/customize/library.vue b/src/views/Workshop/library.vue similarity index 67% rename from src/views/Workshop/customize/library.vue rename to src/views/Workshop/library.vue index 470cab5..002099e 100644 --- a/src/views/Workshop/customize/library.vue +++ b/src/views/Workshop/library.vue @@ -1,16 +1,24 @@