diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index 1baca71..93df8f9 100644
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -12,7 +12,6 @@ p {
}
* {
box-sizing: border-box;
- font-family: 'Medium';
}
html,
body,
@@ -20,6 +19,7 @@ body,
width: 100%;
height: 100%;
overflow: hidden;
+ font-family: 'Medium';
}
@keyframes loading {
0% {
diff --git a/src/assets/css/style.less b/src/assets/css/style.less
index fa738dc..46a45b4 100644
--- a/src/assets/css/style.less
+++ b/src/assets/css/style.less
@@ -13,7 +13,6 @@ p {
* {
box-sizing: border-box;
- font-family: 'Medium';
}
html,
@@ -22,6 +21,7 @@ body,
width: 100%;
height: 100%;
overflow: hidden;
+ font-family: 'Medium';
}
@keyframes loading {
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 7d7f254..8b5a8d5 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -1,9 +1,10 @@
export default {
Login: {
- Login: 'Log in',
- SignUp: 'Sign up',
- LoginTo: 'Log on to',
- LoginTitle: 'A multi-agent canvas for rapid, trend driven design iteration.',
+ login: 'Log in',
+ register: 'Register',
+ signUp: 'Sign up',
+ loginTo: 'Log on to',
+ loginTitle: 'A multi-agent canvas for rapid, trend driven design iteration.',
name: 'Name',
email: 'Email',
password: 'Password',
@@ -42,7 +43,7 @@ export default {
next: 'Next',
nuic2Title: `What's your dream home vibe ?`,
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!'
diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts
index cf4123a..6a1e315 100644
--- a/src/lang/zh-cn.ts
+++ b/src/lang/zh-cn.ts
@@ -1,9 +1,10 @@
export default {
Login: {
- Login: '登录',
- SignUp: '注册',
- LoginTo: '登录到',
- LoginTitle: '一个多智能体画布,用于快速、趋势驱动的设计迭代。',
+ login: '登录',
+ register: '注册',
+ signUp: '注册',
+ loginTo: '登录到',
+ loginTitle: '一个多智能体画布,用于快速、趋势驱动的设计迭代。',
name: '姓名',
email: '邮箱',
password: '密码',
@@ -42,7 +43,7 @@ export default {
next: '下一步',
nuic2Title: `您理想中 家的氛围 是什么?`,
loadMore: '加载更多',
- nuic3Title: `您在哪里 工作 ?您从事什么 工作 ?`,
+ nuic3Title: `您在 哪里 工作?您从事什么 工作 ?`,
basedIn: '公司',
role: '角色',
allSet: '准备好了!',
diff --git a/src/views/home/left-nav.vue b/src/views/home/left-nav.vue
index 0b4174a..bc76308 100644
--- a/src/views/home/left-nav.vue
+++ b/src/views/home/left-nav.vue
@@ -25,15 +25,24 @@
{{ item.name }}
-
+
{{ item.name }}
-
+
-
+
-
@@ -50,6 +59,7 @@
const route = useRoute()
const router = useRouter()
import { useGlobalStore } from '@/stores'
+ const id = computed(() => route.params.id)
const globalStore = useGlobalStore()
const isCollapse = computed(() => globalStore.state.homeLeftNavCollapse)
const onCollapse = () => {
@@ -97,9 +107,21 @@
showHistory.value = !showHistory.value
}
const onClickHistoryItem = (item: any) => {
- console.log(item)
router.push({ name: 'test', params: { id: item.id } })
}
+ const onRenameHistoryItem = (item: any) => {
+ // const index = historyList.value.findIndex((i: any) => i.id == item.id)
+ // if (index != -1) {
+
+ // }
+ }
+ const onDeleteHistoryItem = (item: any) => {
+ console.log(item)
+ const index = historyList.value.findIndex((i: any) => i.id == item.id)
+ if (index != -1) {
+ historyList.value.splice(index, 1)
+ }
+ }
diff --git a/src/views/login/css/style.css b/src/views/login/css/style.css
index af89775..e6d0ada 100644
--- a/src/views/login/css/style.css
+++ b/src/views/login/css/style.css
@@ -98,8 +98,7 @@
.register > .right > .box > .tip,
.login > .right > .box > .tip {
font-weight: 400;
- font-family: General Sans Variable;
- font-style: Regular;
+ font-family: Regular;
font-size: 1.8rem;
color: #666;
margin-top: 0.4rem;
@@ -109,6 +108,10 @@
margin-top: 5rem;
width: 100%;
}
+.register > .right > .box > .el-form::v-deep,
+.login > .right > .box > .el-form::v-deep {
+ font-family: Regular;
+}
.register > .right > .box > .el-form::v-deep .el-form-item,
.login > .right > .box > .el-form::v-deep .el-form-item {
margin-bottom: 2rem;
@@ -118,6 +121,7 @@
color: #252727;
font-size: 1.8rem;
margin-bottom: 0.8rem;
+ font-family: Medium;
}
.register > .right > .box > .el-form::v-deep .el-input,
.login > .right > .box > .el-form::v-deep .el-input {
@@ -167,12 +171,14 @@
border-radius: 0.8rem;
color: #fff;
font-weight: 600;
+ font-family: SemiBold;
}
.register > .right > .box > .tip-2,
.login > .right > .box > .tip-2 {
font-weight: 400;
font-size: 1.6rem;
color: #666;
+ font-family: Regular;
}
.register > .right > .box > .tip-2::v-deep > span,
.login > .right > .box > .tip-2::v-deep > span {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index c1d0385..4fe5c57 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -2,8 +2,8 @@
diff --git a/src/views/login/less/style.less b/src/views/login/less/style.less
index 63deb3c..138b6d3 100644
--- a/src/views/login/less/style.less
+++ b/src/views/login/less/style.less
@@ -95,8 +95,8 @@
>.tip {
font-weight: 400;
- font-family: General Sans Variable;
- font-style: Regular;
+ font-family: Regular;
+ // font-style: Regular;
font-size: 1.8rem;
color: #666;
margin-top: 0.4rem;
@@ -107,6 +107,8 @@
width: 100%;
&::v-deep {
+ font-family: Regular;
+
.el-form-item {
margin-bottom: 2rem;
}
@@ -115,6 +117,7 @@
color: #252727;
font-size: 1.8rem;
margin-bottom: 0.8rem;
+ font-family: Medium;
}
.el-input {
@@ -167,6 +170,7 @@
border-radius: 0.8rem;
color: #fff;
font-weight: 600;
+ font-family: SemiBold;
}
}
}
@@ -175,6 +179,7 @@
font-weight: 400;
font-size: 1.6rem;
color: #666;
+ font-family: Regular;
&::v-deep>span {
text-decoration: underline;
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index b9ab3d1..df526e2 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -17,10 +17,10 @@
-
{{ $t('Login.LoginTo') }}
+
{{ $t('Login.loginTo') }}
- {{ $t('Login.LoginTitle') }}
+ {{ $t('Login.loginTitle') }}
{{
- $t('Login.Login')
+ $t('Login.login')
}}
diff --git a/src/views/login/other-login.vue b/src/views/login/other-login.vue
index 270eb0c..542057c 100644
--- a/src/views/login/other-login.vue
+++ b/src/views/login/other-login.vue
@@ -30,7 +30,7 @@
align-items: center;
justify-content: center;
font-size: 1.6rem;
-
+ font-family: Regular;
&::before,
&::after {
content: '';
diff --git a/src/views/login/visible-code.vue b/src/views/login/visible-code.vue
index 3e72efc..73aeb50 100644
--- a/src/views/login/visible-code.vue
+++ b/src/views/login/visible-code.vue
@@ -44,7 +44,7 @@
clearTime()
})
onMounted(() => {
- setTime(5)
+ setTime()
})
const onResend = () => {
if (time.value > 0) return
@@ -66,14 +66,16 @@
font-weight: 600;
font-size: 4rem;
color: #252727;
+ font-family: SemiBold;
}
> .tip {
margin-top: 2rem;
font-size: 1.8rem;
color: #666;
- > span {
+ font-family: Regular;
+ &::v-deep > span {
color: #252727;
- font-weight: 600;
+ font-family: Medium;
}
}
> .input-code {
@@ -87,17 +89,20 @@
border-radius: 0.8rem;
color: #fff;
font-weight: 600;
+ font-family: SemiBold;
}
> .time {
user-select: none;
margin-top: 2rem;
font-size: 1.6rem;
color: #666;
+ font-family: Regular;
> span {
color: #ff7a50;
text-decoration: underline;
cursor: pointer;
font-weight: 500;
+ font-family: Medium;
}
}
}
diff --git a/src/views/nuic/index.vue b/src/views/nuic/index.vue
index 379b22c..733f024 100644
--- a/src/views/nuic/index.vue
+++ b/src/views/nuic/index.vue
@@ -15,7 +15,11 @@
:key="i"
:state="active === i ? 1 : active > i ? 0 : 2"
>
-
+
@@ -68,6 +72,7 @@
> span {
font-weight: 600;
font-size: 3.3rem;
+ font-family: SemiBold;
}
}
> .header {
@@ -133,6 +138,7 @@
cursor: pointer;
margin-right: 3.4rem;
background-color: #fff;
+ font-family: SemiBold;
&:last-child {
margin-right: 0;
}
diff --git a/src/views/nuic/nuic-1.vue b/src/views/nuic/nuic-1.vue
index 97fde3f..7ee1525 100644
--- a/src/views/nuic/nuic-1.vue
+++ b/src/views/nuic/nuic-1.vue
@@ -39,6 +39,8 @@
margin-bottom: 2rem;
&::v-deep > b {
font-size: 4.8rem;
+ font-family: Migra-Extrabold;
+ font-style: italic;
}
}
> .tip {
@@ -46,6 +48,7 @@
font-size: 2rem;
color: #585858;
margin-bottom: 8.7rem;
+ font-family: Regular;
}
}
diff --git a/src/views/nuic/nuic-2.vue b/src/views/nuic/nuic-2.vue
index 4ca37bd..9c007b2 100644
--- a/src/views/nuic/nuic-2.vue
+++ b/src/views/nuic/nuic-2.vue
@@ -45,6 +45,8 @@
margin-bottom: 6rem;
&::v-deep > b {
font-size: 4.8rem;
+ font-family: Migra-Extrabold;
+ font-style: italic;
}
}
> .list {
@@ -85,6 +87,7 @@
color: #fff;
margin-bottom: 1rem;
text-shadow: 1px 1px 4.7px #d9692b;
+ font-family: SemiBold;
}
}
}
diff --git a/src/views/nuic/nuic-3.vue b/src/views/nuic/nuic-3.vue
index 4ac175f..b13e043 100644
--- a/src/views/nuic/nuic-3.vue
+++ b/src/views/nuic/nuic-3.vue
@@ -5,13 +5,25 @@
{{ $t('Nuic.basedIn') }}
-
+
{{ $t('Nuic.role') }}
-
+
@@ -49,8 +61,10 @@
font-weight: 500;
font-size: 4rem;
margin-bottom: 9.8rem;
- > b {
+ &::v-deep > b {
font-size: 4.8rem;
+ font-family: Migra-Extrabold;
+ font-style: italic;
}
}
> .select-item {
@@ -62,11 +76,14 @@
font-size: 3.6rem;
font-weight: 800;
color: #252727;
+ font-family: Migra-Extrabold;
+ font-style: italic;
}
> .el-select {
width: 100%;
--el-border-radius-base: 0.8rem;
&::v-deep {
+ font-family: Regular;
.el-select__wrapper {
min-height: auto;
height: 6rem;
@@ -80,4 +97,8 @@
margin-top: 15.8rem;
}
}
+
+ .el-select__option {
+ padding: 0 1.8rem;
+ }