diff --git a/src/assets/icons/love_1.svg b/src/assets/icons/love_1.svg new file mode 100644 index 0000000..b13d3e0 --- /dev/null +++ b/src/assets/icons/love_1.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 index f5f9fba..8873c16 100644 Binary files a/src/assets/images/workshop/bg/end_bg.png 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 index bdf81bb..87b1ff8 100644 Binary files a/src/assets/images/workshop/bg/picture_bg.png 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 index 2271943..2dc92ac 100644 Binary files a/src/assets/images/workshop/bg/upload_bg.png and b/src/assets/images/workshop/bg/upload_bg.png differ diff --git a/src/components/FooterNavigation.vue b/src/components/FooterNavigation.vue index 0ccd824..8dd3468 100644 --- a/src/components/FooterNavigation.vue +++ b/src/components/FooterNavigation.vue @@ -22,17 +22,17 @@ message: 'The current page has not been saved. Do you want to return to the home page?' }) .then(() => { - router.push(nav.path) + nav.path && router.push(nav.path) }) .catch(() => {}) } const navs = [ { label: 'Home', icon: 'home', size: 73, path: '/welcome', on: onHome }, { label: 'Library', icon: 'library', size: 53, path: '/workshop/library' }, - { label: 'Profile', icon: 'profile', size: 55, path: '/workshop/creation' } + { label: 'Profile', icon: 'profile', size: 55, path: '' } ] const onNavClick = (nav) => { - if (currentRoute.value !== nav.path) nav.on ? nav.on(nav) : router.push(nav.path) + if (currentRoute.value !== nav.path) nav.on ? nav.on(nav) : nav.path && router.push(nav.path) } diff --git a/src/router/index.ts b/src/router/index.ts index 43697e3..5954606 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -60,12 +60,10 @@ const router = createRouter({ name: 'Workshop', component: () => import('../views/Workshop/index.vue'), children: [ - // { - // path: '', - // name: 'activitiesWorkshop', - // redirect: "/activities/workshop", - // }, - + { + path: '/workshop', + redirect: "/workshop/selectStyle", + }, { path: '/workshop/selectStyle', name: 'SelectStyle', diff --git a/src/views/Workshop/creation.vue b/src/views/Workshop/creation.vue index 95713fb..46c7a64 100644 --- a/src/views/Workshop/creation.vue +++ b/src/views/Workshop/creation.vue @@ -11,12 +11,11 @@ emit('view-type', 1) }) const onSave = () => { - // console.log('保存') - router.push({ name: 'end' }) + console.log('保存') } const onContinue = () => { - console.log('继续创建') + router.push({ name: 'end' }) } @@ -72,6 +71,7 @@ border-radius: 2rem; background-color: #fff; margin-bottom: 4rem; + border: 0.1rem solid #000; > img { width: 100%; height: 100%; diff --git a/src/views/Workshop/customize.vue b/src/views/Workshop/customize.vue index 72cf8f0..b868269 100644 --- a/src/views/Workshop/customize.vue +++ b/src/views/Workshop/customize.vue @@ -1,6 +1,33 @@ diff --git a/src/views/Workshop/library.vue b/src/views/Workshop/library.vue index 002099e..d3c8009 100644 --- a/src/views/Workshop/library.vue +++ b/src/views/Workshop/library.vue @@ -1,5 +1,5 @@ @@ -22,14 +34,14 @@
Library
-
+
- User ID: 1234567890 - 7/22/2025 18:20 - Last opened 18:20 + User ID: {{ v.userID }} + {{ v.datetime }} + Last opened {{ v.lastopened }}
@@ -65,7 +77,6 @@ right: -40rem; background: linear-gradient(88.42deg, #ffffff 32.58%, #d9d9d9 94.9%); transform: rotate(-45deg); - } > .title {