-
- 
+
+
+
+
-
-
-
-
+
-
+ ![]()
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ 
-
- 
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('Input.chooseStyle') }}
+
+
+
+
+ {{ $t(item.label) }}
+
+
-
-
-
-
-
-
diff --git a/src/views/home/test.vue b/src/views/home/test.vue
index 6f456f1..aff93a7 100644
--- a/src/views/home/test.vue
+++ b/src/views/home/test.vue
@@ -1,6 +1,6 @@
{{ $t('Input.chooseStyle') }}
-
+
-
+
{{ $t('Input.styleTitle') }}
+
-
-
-
-
+ {{ $t('Input.setting') }}
-
+
+
+
+ 
+ {{ $t('Input.createProject') }}
-
+
+ {{ $t('Input.createProject') }}
+
-
@@ -13,10 +13,9 @@
diff --git a/src/views/login/less/style.less b/src/views/login/less/style.less
index 63deb3c..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: General Sans Variable;
- font-style: Regular;
+ font-family: Regular;
font-size: 1.8rem;
color: #666;
- margin-top: 0.4rem;
+ margin-top: 0.5rem;
}
>.el-form {
@@ -107,6 +105,8 @@
width: 100%;
&::v-deep {
+ font-family: Regular;
+
.el-form-item {
margin-bottom: 2rem;
}
@@ -115,6 +115,7 @@
color: #252727;
font-size: 1.8rem;
margin-bottom: 0.8rem;
+ font-family: Medium;
}
.el-input {
@@ -167,6 +168,7 @@
border-radius: 0.8rem;
color: #fff;
font-weight: 600;
+ font-family: SemiBold;
}
}
}
@@ -175,6 +177,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..34e3508 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -2,10 +2,7 @@
老八秘制小汉堡 - {{ id }}
+Conversation Item - {{ id }}
-
- 
- FiDA
-
+
- FiDA
-
@@ -16,11 +13,8 @@
-
{{
- $t('Login.Login')
+ $t('Login.login')
}}
@@ -99,7 +93,7 @@
}
const onVerifyCode = (code: string) => {
console.log(code)
- router.push({ name: 'home' })
+ router.push({ name: 'mainInput' })
}
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/register.vue b/src/views/login/register.vue
index 12975c0..6b4244b 100644
--- a/src/views/login/register.vue
+++ b/src/views/login/register.vue
@@ -2,10 +2,7 @@
-
@@ -45,6 +45,7 @@
margin-bottom: 6rem;
&::v-deep > b {
font-size: 4.8rem;
+ font-family: MBold;
}
}
> .list {
@@ -85,6 +86,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..daa50ba 100644
--- a/src/views/nuic/nuic-3.vue
+++ b/src/views/nuic/nuic-3.vue
@@ -5,13 +5,25 @@
-
-
-
- {{ $t('Login.LoginTo') }}
- 
-
-
- {{ $t('Login.LoginTitle') }}
+
+ {{ $t('Login.loginTitle') }}
-
-
- FiDA
-
+
- FiDA
-
@@ -16,14 +13,15 @@
-
-
- {{ $t('Login.register') }}
+ {{
+ $t('Login.register')
+ }}
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..7498093 100644
--- a/src/views/nuic/index.vue
+++ b/src/views/nuic/index.vue
@@ -1,10 +1,7 @@
-
- {{ $t('Login.registerFor') }}
-
-
+
- {{ $t('Login.registerTip') }}
-
@@ -32,15 +37,19 @@
const route = useRoute()
const active = computed(() => Number(route.query.index || 0))
const list = markRaw([nuic1, nuic2, nuic3])
+ const loading = ref(false)
const onClose = () => {
- router.push({ name: 'home' })
+ router.push({ name: 'mainInput' })
}
const onNext = () => {
const index = active.value + 1
if (index < list.length) {
router.push({ query: { index } })
} else {
- router.push({ name: 'home' })
+ loading.value = true
+ setTimeout(() => {
+ router.push({ name: 'mainInput' })
+ }, 1000)
}
}
@@ -57,18 +66,10 @@
// justify-content: center;
> .logo {
position: absolute;
- top: 3.8rem;
- left: 3.8rem;
-
- > img {
- width: 6rem;
- height: auto;
- }
-
- > span {
- font-weight: 600;
- font-size: 3.3rem;
- }
+ top: 2.7rem;
+ left: 3.6rem;
+ width: auto;
+ height: 2.4rem;
}
> .header {
margin-top: 5rem;
@@ -133,6 +134,7 @@
cursor: pointer;
margin-right: 3.4rem;
background-color: #fff;
+ font-family: SemiBold;
&:last-child {
margin-right: 0;
}
@@ -145,5 +147,19 @@
}
}
}
+ > .loading {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ background-color: #f8f7f5;
+ > .tip {
+ font-family: Regular;
+ font-size: 3rem;
+ color: #585858;
+ }
+ }
}
diff --git a/src/views/nuic/nuic-1.vue b/src/views/nuic/nuic-1.vue
index 97fde3f..967689a 100644
--- a/src/views/nuic/nuic-1.vue
+++ b/src/views/nuic/nuic-1.vue
@@ -17,7 +17,7 @@
const router = useRouter()
const emit = defineEmits(['next'])
const onSkip = () => {
- router.push({ name: 'home' })
+ router.push({ name: 'mainInput' })
}
@@ -39,6 +39,7 @@
margin-bottom: 2rem;
&::v-deep > b {
font-size: 4.8rem;
+ font-family: MBold;
}
}
> .tip {
@@ -46,6 +47,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..d129c52 100644
--- a/src/views/nuic/nuic-2.vue
+++ b/src/views/nuic/nuic-2.vue
@@ -10,11 +10,11 @@
-
- FiDA
-
-
- FiDA
-
+
+
+
-
+
+
+ 
+
+ {{ $t('Nuic.loadingTip') }}
+
+
-
{{ $t('Nuic.basedIn') }}
{{ $t('Nuic.role') }}
@@ -49,8 +61,9 @@
font-weight: 500;
font-size: 4rem;
margin-bottom: 9.8rem;
- > b {
+ &::v-deep > b {
font-size: 4.8rem;
+ font-family: MBold;
}
}
> .select-item {
@@ -58,15 +71,17 @@
width: 50rem;
text-align: left;
> .title {
- margin-bottom: 3rem;
+ margin-bottom: 1.5rem;
font-size: 3.6rem;
font-weight: 800;
color: #252727;
+ font-family: LBold;
}
> .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 +95,8 @@
margin-top: 15.8rem;
}
}
+
+ .el-select__option {
+ padding: 0 1.8rem;
+ }