diff --git a/src/assets/images/homeBg.png b/src/assets/images/homeBg.png new file mode 100644 index 0000000..92b7848 Binary files /dev/null and b/src/assets/images/homeBg.png differ diff --git a/src/views/Workshop/home.vue b/src/views/Workshop/home.vue index 821a8a4..783c6c2 100644 --- a/src/views/Workshop/home.vue +++ b/src/views/Workshop/home.vue @@ -3,7 +3,7 @@ import { onMounted, onUnmounted, reactive, toRefs, computed, onActivated } from import { useRouter } from 'vue-router' const router = useRouter() import { showConfirmDialog } from 'vant' -import MyEvent from '@/utils/myEvent' +import { FlowType } from '@/types/enum' //const props = defineProps({ //}) @@ -14,27 +14,12 @@ const emit = defineEmits([ // const data = reactive({ // }) -const clickSwitchVIPID = ()=>{ - showConfirmDialog({ - title: 'Switch VIP ID?', - message: 'You have unsaved changes. Your progress will be lost.', - confirmButtonText: 'Yes', - cancelButtonText: 'Cancel', - }) - .then(() => { - MyEvent.emit('clear-generate-state') - MyEvent.emit('clearAllCache') - router.push({ name: 'customer', query: { demo: 1 } }) - }) - .catch(() => {}) +const newJourney = ()=>{ + router.push(`/workshop/styList/index?flowType=${FlowType.MAIN}`) } -const openFlow = (path:string,flowType:string)=>{ - if(flowType == 'clientId')return clickSwitchVIPID() - if(flowType == 'main'){ - router.push({ name: path }) - }else{ - router.push({ name: path, query: { demo: 1 } }) - } + +const historicalReview = ()=>{ + router.push(`/workshop/creation?flowType=${FlowType.HISTORY}`) } onMounted(()=>{ @@ -46,29 +31,14 @@ defineExpose({}) // const { } = toRefs(data); @@ -77,46 +47,46 @@ defineExpose({}) --header-title-background: #fff; --header-title-height: 12rem !important; } - .homeNavPage{ - > .title{ - padding: 0 8.4rem; - font-family: satoshiBold; - font-weight: 700; - margin-top: 6.8rem; - font-size: 9.6rem; - line-height: 124%; - background: #B3B3B3; - background: linear-gradient(120deg, #b3b3b3 1%, rgba(0, 0, 0, 0) 48%), linear-gradient( - 344deg, #B3B3B2 16%, #000000 66%); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - background-clip: text; + .homePage{ + position: relative; + flex: 1; + > .homeBg{ + position: absolute; + width: 100%; + height: 100%; + object-fit: cover; } - > .navBox{ - > .navTitle{ - padding: 0 8.4rem; - font-family: satoshiBold; - font-weight: 700; - font-size: 5.2rem; - margin: 6.3rem 0; - } - > .navList{ - display: flex; - flex-wrap: wrap; - padding: 0 7.4rem; - gap: 4.8rem; - > .item{ - // width: 44.2rem; - // height: 41.6rem; - height: auto; - width: calc(50% - 4.8rem / 2); - > img{ - width: 100%; - height: 100%; - object-fit: contain; - } + > .button{ + margin: 64.3rem auto 0; + font-family: satoshiBold; + font-size: 4.6rem; + color: #fff; + text-align: center; + display: flex; + flex-direction: column; + align-items: center; + > .item{ + width: 45.6rem; + margin-bottom: 8rem; + line-height: 13.1rem; + border: 1.16px solid #FFFFFF; + backdrop-filter: blur(2.5rem); + background: radial-gradient(100% 100% at 0% 0%, rgba(115, 115, 115, 0.4) 0%, rgba(0, 0, 0, 0) 100%); + &:last-child{ + margin-bottom: 0; } } } + > .info{ + position: absolute; + bottom: 7rem; + font-size: 3rem; + font-family: satoshiRegular; + color: #fff; + text-align: center; + width: 100%; + font-weight: 400; + letter-spacing: .5rem; + } } \ No newline at end of file diff --git a/src/views/Workshop/homeNav.vue b/src/views/Workshop/homeNav.vue index 821a8a4..196178e 100644 --- a/src/views/Workshop/homeNav.vue +++ b/src/views/Workshop/homeNav.vue @@ -1,5 +1,5 @@ @@ -104,13 +104,12 @@ const handleConfirm = async () => { overflow: hidden; color: #fff; position: relative; - // background: url('@/assets/images/no_shouder_bg.png') no-repeat center center; + background: url('@/assets/images/no_shouder_bg.png') no-repeat center center; background-size: cover; background-position: center; background-repeat: no-repeat; &.form-mode { background: url('@/assets/images/has_shouder_bg.png') no-repeat center center/cover; - padding-top: 15.9rem; } .setting { @@ -122,7 +121,8 @@ const handleConfirm = async () => { } } .content { - margin-top: 55.3rem; + // margin-top: 55.3rem; + row-gap: 12.7rem; .text { font-family: 'satoshiBold'; font-size: 13rem; @@ -140,37 +140,22 @@ const handleConfirm = async () => { justify-content: center; border-radius: 4rem; } - } - .entry-btn { - position: absolute; - border: 0.2rem solid #fff; - bottom: 10.3rem; - right: 5.5rem; - height: 9rem; - width: 27.5rem; - line-height: 9rem; - font-size: 5.6rem; + .btn-list { + column-gap: 17rem; + .btn { + height: 8.3rem; + width: 29.7rem; + line-height: 8.3rem; + font-size: 4.8rem; + border: 0.2rem solid #fff; + } + } } .form-container { - .menu { - padding: 0 4.8rem 0 8.4rem; - .back-container { - width: 7.3rem; - height: 7.3rem; - border-radius: 1.8rem; - font-size: 4.3rem; - position: relative; - - .back-icon { - width: 2.08rem; - height: 3.47rem; - } - } - } + width: 78.8rem; + margin: 0 auto; .text { - padding-left: 15.2rem; - margin-top: 15.4rem; letter-spacing: 0.02rem; } .form-title { @@ -182,18 +167,16 @@ const handleConfirm = async () => { font-size: 3.6rem; line-height: 141%; letter-spacing: 0.08rem; - margin-top: 2.7rem; + margin: 3.1rem 0 11rem 0; font-family: 'satoshiRegular'; } .glass-form { - height: 68.8rem; + height: 68.7rem; + width: 78.8rem; border: 0.2rem solid #ffffff; border-radius: 4.7rem; - margin: 0 14.2rem; - // padding: 8.2rem 7.9rem; padding: 11rem 7.5rem; - margin-top: 11rem; box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1), inset 0 1px 0 rgba(255, 255, 255, 0.1); display: flex; flex-direction: column; @@ -251,6 +234,18 @@ const handleConfirm = async () => { box-shadow: 0 0.2rem 8px rgba(0, 0, 0, 0.2); } } + .show-all { + margin-top: 4rem; + width: 19rem; + height: 7.6rem; + border-radius: 54px; + color: #000; + text-align: center; + line-height: 7.6rem; + background-color: #fff; + font-size: 3.1rem; + font-family: 'satoshiRegular'; + } .copyright { font-family: 'satoshiRegular'; font-size: 3rem; @@ -259,7 +254,7 @@ const handleConfirm = async () => { margin-top: 2.31rem; text-align: center; font-weight: 400; - margin-top: 18.7rem; + margin-top: 11.5rem; } } } diff --git a/src/views/stylist/dressfor.vue b/src/views/stylist/dressfor.vue index d4c210b..76768aa 100644 --- a/src/views/stylist/dressfor.vue +++ b/src/views/stylist/dressfor.vue @@ -1,11 +1,13 @@