diff --git a/public/fonts/general/css/general-sans.css b/public/fonts/general/css/general-sans.css index ad61178..ac2fb00 100644 --- a/public/fonts/general/css/general-sans.css +++ b/public/fonts/general/css/general-sans.css @@ -67,4 +67,20 @@ font-weight: 700; font-display: swap; font-style: normal; +} + +@font-face { + font-family: 'LBold'; + src:url('../fonts/MazzardL-Bold.otf') format('opentype'); + font-weight: 700; + font-display: swap; + font-style: normal; +} + +@font-face { + font-family: 'MBold'; + src:url('../fonts/MazzardM-Bold.otf') format('opentype'); + font-weight: 700; + font-display: swap; + font-style: normal; } \ No newline at end of file diff --git a/public/fonts/general/fonts/MazzardL-Bold.otf b/public/fonts/general/fonts/MazzardL-Bold.otf new file mode 100644 index 0000000..f931c26 Binary files /dev/null and b/public/fonts/general/fonts/MazzardL-Bold.otf differ diff --git a/public/fonts/general/fonts/MazzardM-Bold.otf b/public/fonts/general/fonts/MazzardM-Bold.otf new file mode 100644 index 0000000..e6e02b2 Binary files /dev/null and b/public/fonts/general/fonts/MazzardM-Bold.otf differ diff --git a/src/assets/icons/add-print.svg b/src/assets/icons/add-print.svg new file mode 100644 index 0000000..6d79cf8 --- /dev/null +++ b/src/assets/icons/add-print.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/color-palette.svg b/src/assets/icons/color-palette.svg new file mode 100644 index 0000000..ac53b30 --- /dev/null +++ b/src/assets/icons/color-palette.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/icons/edit-material.svg b/src/assets/icons/edit-material.svg new file mode 100644 index 0000000..721bd72 --- /dev/null +++ b/src/assets/icons/edit-material.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/mobang.svg b/src/assets/icons/mobang.svg new file mode 100644 index 0000000..e72ce0d --- /dev/null +++ b/src/assets/icons/mobang.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/assets/icons/scene-composition.svg b/src/assets/icons/scene-composition.svg new file mode 100644 index 0000000..2c3071f --- /dev/null +++ b/src/assets/icons/scene-composition.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/icons/to-3d-model.svg b/src/assets/icons/to-3d-model.svg new file mode 100644 index 0000000..413345b --- /dev/null +++ b/src/assets/icons/to-3d-model.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/to-real-style.svg b/src/assets/icons/to-real-style.svg new file mode 100644 index 0000000..972430e --- /dev/null +++ b/src/assets/icons/to-real-style.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/icons/to-video.svg b/src/assets/icons/to-video.svg new file mode 100644 index 0000000..e3393bc --- /dev/null +++ b/src/assets/icons/to-video.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/upload.svg b/src/assets/icons/upload.svg new file mode 100644 index 0000000..6c8b4d0 --- /dev/null +++ b/src/assets/icons/upload.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/xingxing.svg b/src/assets/icons/xingxing.svg new file mode 100644 index 0000000..5356a86 --- /dev/null +++ b/src/assets/icons/xingxing.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/login/elephant.png b/src/assets/images/login/elephant.png index ba454b7..280cf07 100644 Binary files a/src/assets/images/login/elephant.png and b/src/assets/images/login/elephant.png differ diff --git a/src/assets/images/login/index-bg.png b/src/assets/images/login/index-bg.png new file mode 100644 index 0000000..dc26384 Binary files /dev/null and b/src/assets/images/login/index-bg.png differ diff --git a/src/assets/images/login/index-title.png b/src/assets/images/login/index-title.png new file mode 100644 index 0000000..d2093fc Binary files /dev/null and b/src/assets/images/login/index-title.png differ diff --git a/src/assets/images/login/index-zhuangshi.png b/src/assets/images/login/index-zhuangshi.png new file mode 100644 index 0000000..5af7d61 Binary files /dev/null and b/src/assets/images/login/index-zhuangshi.png differ diff --git a/src/assets/images/login/left-bg.png b/src/assets/images/login/left-bg.png index a0e76a6..006be3a 100644 Binary files a/src/assets/images/login/left-bg.png and b/src/assets/images/login/left-bg.png differ diff --git a/src/assets/images/login/right-bg.png b/src/assets/images/login/right-bg.png new file mode 100644 index 0000000..93c9848 Binary files /dev/null and b/src/assets/images/login/right-bg.png differ diff --git a/src/assets/images/logo-1.png b/src/assets/images/logo-1.png new file mode 100644 index 0000000..ffbd742 Binary files /dev/null and b/src/assets/images/logo-1.png differ diff --git a/src/assets/images/logo-2.png b/src/assets/images/logo-2.png index 3667fa8..c281cb5 100644 Binary files a/src/assets/images/logo-2.png and b/src/assets/images/logo-2.png differ diff --git a/src/assets/images/nuic/loading.png b/src/assets/images/nuic/loading.png new file mode 100644 index 0000000..2dfc479 Binary files /dev/null and b/src/assets/images/nuic/loading.png differ diff --git a/src/lang/en.ts b/src/lang/en.ts index e5a8f7c..02b1879 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -1,9 +1,10 @@ export default { + AlphaVersion: '2026 Alpha Version', Login: { login: 'Log in', register: 'Register', signUp: 'Sign up', - loginTo: 'Log on to', + loginTo: 'Log on to FiDA', loginTitle: 'A multi-agent canvas for rapid, trend driven design iteration.', name: 'Name', email: 'Email', @@ -22,7 +23,7 @@ export default { agreeTermsPolicy: 'I agree to the Terms, Policy and Fees.', noAccountToSignUp: `Don't have an account? Sign up`, - registerFor: 'Register for', + signUpFor: 'Sign up for FiDA', registerTip: 'A multi-agent canvas for rapid, trend driven design iteration.', havenAccountToLogin: `Already have an account? Log in`, verifyEmail: 'Verify your email address', @@ -32,21 +33,23 @@ export default { resendCodeIn: 'Resend Code in {time}', orContinueWith: 'or continue with', googleLogin: 'Sign in with Google', - wechatLogin: 'Sign in with Wechat' + wechatLogin: 'Sign in with Wechat', + indexTip: 'A multi-agent canvas for rapid, trend driven design iteration.', }, Nuic: { - hiName: 'Hi, {name}.', - nuic1Title: `Help Fiphant discover the 'YOU' in your space.`, + hiName: 'Hi, {name}. This is Fiphant.', + nuic1Title: `Help him discover the "YOU" in your space.`, nuic1Tip: `Let's set up your profile. A few quick details will help Fiphant understand
your needs and find exactly what you're looking for.`, letsGo: 'Let’s go, Fiphant!', skip: 'Skip', next: 'Next', - nuic2Title: `What's your dream home vibe ?`, + nuic2Title: `What vibe do you usually go for?`, loadMore: 'Load more', - nuic3Title: `Where are you based? What do you do ?`, + nuic3Title: `Where are you based? What do you do?`, basedIn: 'Based in', role: 'Role', - allSet: 'All set!' + allSet: 'All set!', + loadingTip: 'We’re customizing your dashboard.', }, Home: { creditsNum: 'Credits: {num}', diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts index 7189675..0bb4f0d 100644 --- a/src/lang/zh-cn.ts +++ b/src/lang/zh-cn.ts @@ -1,9 +1,10 @@ export default { + AlphaVersion: '2026版本', Login: { login: '登录', register: '注册', signUp: '注册', - loginTo: '登录到', + loginTo: '登录到 FiDA条款、政策 和费用。', noAccountToSignUp: `还没有账号？ 注册`, - registerFor: '注册账号', + signUpFor: '注册账号', registerTip: '一个多智能体画布，用于快速、趋势驱动的设计迭代。', havenAccountToLogin: `已经有账号？ 登录`, verifyEmail: '验证您的邮箱地址', @@ -32,21 +33,23 @@ export default { resendCodeIn: '重新发送验证码倒计时 {time}', orContinueWith: '或者使用', googleLogin: '使用 Google 登录', - wechatLogin: '使用微信登录' + wechatLogin: '使用微信登录', + indexTip: '一个多智能体画布，用于快速、趋势驱动的设计迭代。', }, Nuic: { - hiName: '你好，{name}。', - nuic1Title: `帮助 Fiphant 发现您空间中的 'YOU'。`, + hiName: '你好，{name}。这是 Fiphant。', + nuic1Title: `帮助他发现您空间中的 “YOU”。`, nuic1Tip: `让我们设置您的个人资料。几个快速的细节将帮助 Fiphant 理解您的需求并找到您正在寻找的内容。`, letsGo: '让我们开始，Fiphant！', skip: '跳过', next: '下一步', - nuic2Title: `您理想中 家的氛围 是什么？`, + nuic2Title: `你通常喜欢什么样的风格呢？`, loadMore: '加载更多', - nuic3Title: `您在 哪里 工作？您从事什么 工作 ？`, + nuic3Title: `您在 哪里 工作？您从事什么 工作？`, basedIn: '公司', role: '角色', - allSet: '准备好了！' + allSet: '准备好了！', + loadingTip: '我们正在自定义您的仪表板。', }, Home: { creditsNum: '积分: {num}', diff --git a/src/router/index.ts b/src/router/index.ts index 980b8a4..ad37270 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -55,7 +55,13 @@ const router = createRouter({ path: 'mainInput', name: 'mainInput', component: () => import('../views/home/mainInput.vue') - } + }, + { + path: 'canvas', + name: 'canvas', + component: () => import('../views/canvas/index.vue'), + meta: { topNavStyle: '2' } + }, ] }, { diff --git a/src/views/canvas/components/card.vue b/src/views/canvas/components/card.vue new file mode 100644 index 0000000..825b9eb --- /dev/null +++ b/src/views/canvas/components/card.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/src/views/canvas/components/cards/scene-composition.vue b/src/views/canvas/components/cards/scene-composition.vue new file mode 100644 index 0000000..9f2ceaf --- /dev/null +++ b/src/views/canvas/components/cards/scene-composition.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/src/views/canvas/components/cards/to-real-style.vue b/src/views/canvas/components/cards/to-real-style.vue new file mode 100644 index 0000000..cbf9ae5 --- /dev/null +++ b/src/views/canvas/components/cards/to-real-style.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/src/views/canvas/components/my-textarea.vue b/src/views/canvas/components/my-textarea.vue new file mode 100644 index 0000000..f62a6c2 --- /dev/null +++ b/src/views/canvas/components/my-textarea.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/src/views/canvas/components/pixel-ratio-selection.vue b/src/views/canvas/components/pixel-ratio-selection.vue new file mode 100644 index 0000000..7643e36 --- /dev/null +++ b/src/views/canvas/components/pixel-ratio-selection.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/src/views/canvas/components/upload-file.vue b/src/views/canvas/components/upload-file.vue new file mode 100644 index 0000000..cb5fe6f --- /dev/null +++ b/src/views/canvas/components/upload-file.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/src/views/canvas/index.vue b/src/views/canvas/index.vue new file mode 100644 index 0000000..2b83bc1 --- /dev/null +++ b/src/views/canvas/index.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/home/left-nav.vue b/src/views/home/left-nav.vue index bc76308..635cefa 100644 --- a/src/views/home/left-nav.vue +++ b/src/views/home/left-nav.vue @@ -15,6 +15,10 @@ {{ $t('Home.home') }} --> +
+ + 画布 +
{{ $t('Home.history') }} @@ -103,6 +107,9 @@ const onHome = () => { console.log('onHome') } + const onCanvas = () => { + router.push({ name: 'canvas' }) + } const onHistory = () => { showHistory.value = !showHistory.value } @@ -112,7 +119,6 @@ const onRenameHistoryItem = (item: any) => { // const index = historyList.value.findIndex((i: any) => i.id == item.id) // if (index != -1) { - // } } const onDeleteHistoryItem = (item: any) => { @@ -247,7 +253,7 @@ white-space: nowrap; overflow: hidden; } - >.icon{ + > .icon { width: 2.5rem; height: 2.5rem; } diff --git a/src/views/home/top-nav.vue b/src/views/home/top-nav.vue index 754dd48..cfab55c 100644 --- a/src/views/home/top-nav.vue +++ b/src/views/home/top-nav.vue @@ -68,7 +68,7 @@ height: 4.3rem; margin-right: 1rem; background-color: rgba(255, 252, 244, 1); - border: 1px solid rgba(233, 121, 60, 1); + border: 1px solid #FFCF90; border-radius: 0.8rem; > .credits { flex: 1; @@ -78,7 +78,7 @@ > .link { height: 100%; width: 0; - border-right: 1px solid rgba(233, 121, 60, 1); + border-right: 1px solid #FFCF90; } > .icon { cursor: pointer; diff --git a/src/views/login/css/style.css b/src/views/login/css/style.css index e6d0ada..d552fa6 100644 --- a/src/views/login/css/style.css +++ b/src/views/login/css/style.css @@ -3,7 +3,6 @@ width: 100%; height: 100%; overflow: hidden; - padding: 2.5rem; display: flex; user-select: none; } @@ -19,18 +18,14 @@ width: 100%; height: 100%; object-fit: cover; - border-radius: 2rem; } .register > .left > .logo, .login > .left > .logo { position: absolute; - top: 2.4rem; - left: 4.2rem; -} -.register > .left > .logo > img, -.login > .left > .logo > img { - width: 6rem; - height: auto; + top: 3.2rem; + left: 3.8rem; + width: auto; + height: 2.5rem; } .register > .left > .logo > span, .login > .left > .logo > span { @@ -40,22 +35,26 @@ } .register > .right, .login > .right { - width: 90rem; + width: 99rem; min-width: 600px; display: flex; flex-direction: column; + background-image: url('@/assets/images/login/right-bg.png'); + background-size: auto 100%; + background-position: left center; + background-repeat: no-repeat; } .register > .right > .top, .login > .right > .top { display: flex; - padding: 0 3rem; + padding: 3rem 0 0 3rem; } .register > .right > .top > .back, .login > .right > .top > .back { width: 5rem; height: 5rem; border-radius: 1.2rem; - border: 0.25rem solid #dfdfdf; + border: 0.25rem solid #252727; background-color: transparent; cursor: pointer; } @@ -71,8 +70,8 @@ } .register > .right > .box > img, .login > .right > .box > img { - width: 11rem; - height: auto; + width: auto; + height: 12rem; margin-top: 2rem; } .register > .right > .box > .visible-code, @@ -83,17 +82,17 @@ .register > .right > .box > .title, .login > .right > .box > .title { font-weight: 600; - font-size: 7rem; + font-size: 6.1rem; display: flex; align-items: center; justify-content: center; color: #252727; - margin-top: 1.7rem; } -.register > .right > .box > .title > img, -.login > .right > .box > .title > img { - width: auto; - height: 9.8rem; +.register > .right > .box > .title::v-deep > *, +.login > .right > .box > .title::v-deep > * { + margin-left: 1rem; + font-family: LBold; + margin-bottom: -1rem; } .register > .right > .box > .tip, .login > .right > .box > .tip { @@ -101,7 +100,7 @@ font-family: Regular; font-size: 1.8rem; color: #666; - margin-top: 0.4rem; + margin-top: 0.5rem; } .register > .right > .box > .el-form, .login > .right > .box > .el-form { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 4fe5c57..571b061 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,10 +1,15 @@ @@ -26,6 +31,9 @@ height: 100%; overflow: hidden; position: relative; + background-image: url('@/assets/images/login/index-bg.png'); + background-size: cover; + background-position: center; > .header { position: absolute; top: 3rem; @@ -33,7 +41,22 @@ width: 100%; display: flex; justify-content: center; - align-items: center; + // align-items: center; + > .tip { + position: absolute; + width: 100%; + top: 0; + left: 0; + font-size: 3rem; + text-align: center; + font-family: Regular; + color: #fff; + } + > .logo { + width: auto; + height: 2.5rem; + margin-left: 3.8rem; + } > .split { margin: 0 auto; } @@ -47,18 +70,43 @@ font-size: 2.2rem; font-weight: 600; font-family: SemiBold; + border: 0.2rem solid #fff; &:active { opacity: 0.8; } } > .login { - background-color: #ff7a51; - color: #fff; + background-color: #fff; + color: #713e1f; } > .register { - background-color: #fff; - color: #232323; + background-color: transparent; + color: #ffffff; + backdrop-filter: blur(10px); } } + > .zhuangshi, + > .title, + > .tip { + position: absolute; + left: 50%; + transform: translateX(-50%); + } + > .title { + width: 55%; + height: auto; + top: 20.5rem; + } + > .zhuangshi { + width: 21.5rem; + height: auto; + bottom: 13.4rem; + } + > .tip { + font-size: 2.8rem; + font-family: Regular; + color: #fff; + bottom: 8rem; + } } diff --git a/src/views/login/less/style.less b/src/views/login/less/style.less index 138b6d3..da039f3 100644 --- a/src/views/login/less/style.less +++ b/src/views/login/less/style.less @@ -3,7 +3,6 @@ width: 100%; height: 100%; overflow: hidden; - padding: 2.5rem; display: flex; user-select: none; @@ -17,18 +16,14 @@ width: 100%; height: 100%; object-fit: cover; - border-radius: 2rem; } >.logo { position: absolute; - top: 2.4rem; - left: 4.2rem; - - >img { - width: 6rem; - height: auto; - } + top: 3.2rem; + left: 3.8rem; + width: auto; + height: 2.5rem; >span { font-weight: 600; @@ -39,20 +34,24 @@ } >.right { - width: 90rem; + width: 99rem; min-width: 600px; display: flex; flex-direction: column; + background-image: url('@/assets/images/login/right-bg.png'); + background-size: auto 100%; + background-position: left center; + background-repeat: no-repeat; >.top { display: flex; - padding: 0 3rem; + padding: 3rem 0 0 3rem; >.back { width: 5rem; height: 5rem; border-radius: 1.2rem; - border: 0.25rem solid rgba(223, 223, 223, 1); + border: 0.25rem solid #252727; background-color: transparent; cursor: pointer; } @@ -68,8 +67,8 @@ align-items: center; >img { - width: 11rem; - height: auto; + width: auto; + height: 12rem; margin-top: 2rem; } @@ -80,26 +79,25 @@ >.title { font-weight: 600; - font-size: 7rem; + font-size: 6.1rem; display: flex; align-items: center; justify-content: center; color: #252727; - margin-top: 1.7rem; - >img { - width: auto; - height: 9.8rem; + &::v-deep>* { + margin-left: 1rem; + font-family: LBold; + margin-bottom: -1rem; } } >.tip { font-weight: 400; font-family: Regular; - // font-style: Regular; font-size: 1.8rem; color: #666; - margin-top: 0.4rem; + margin-top: 0.5rem; } >.el-form { diff --git a/src/views/login/login.vue b/src/views/login/login.vue index 7a981e9..34e3508 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -2,10 +2,7 @@
- +
@@ -16,10 +13,7 @@