diff --git a/src/App.vue b/src/App.vue index 2e627f8..54e0400 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@ diff --git a/src/router/index.ts b/src/router/index.ts index d6de39f..d79a09a 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -32,14 +32,23 @@ export const router = createRouter({ requiresAuth: false, requireLogin: true, group: GROUP_MAIN_NAME, - } + }, }, { path: '/chat/:conversationId?', name: 'Home', component: () => import('@/views/home/index.vue'), meta: { - requiresAuth: false, + requiresAuth: true, + requireLogin: true, + }, + }, + { + path: '/trial', + name: 'Trial', + component: () => import('@/views/trial/index.vue'), + meta: { + requiresAuth: true, requireLogin: true, }, }, diff --git a/src/styles/components/ant-button.scss b/src/styles/components/ant-button.scss index 79571a7..ad53838 100644 --- a/src/styles/components/ant-button.scss +++ b/src/styles/components/ant-button.scss @@ -1,5 +1,5 @@ .ant-btn { - border-radius: 2px !important; + border-radius: 4px !important; border: 1px solid #d7d7d9 !important; color: #3c4043 !important; font-family: $font-family-regular; diff --git a/src/styles/components/ant-input.scss b/src/styles/components/ant-input.scss index a35bcab..1f99625 100644 --- a/src/styles/components/ant-input.scss +++ b/src/styles/components/ant-input.scss @@ -27,7 +27,7 @@ &.ant-input-focus, &.ant-textarea-focus { background-color: var(--color-bg-2) !important; - border-color: rgb(var(--primary-6)) !important; + border-color: $color-primary !important; box-shadow: 0 0 0 0 var(--color-primary-light-2) !important; } &.ant-input-disabled { @@ -72,7 +72,7 @@ textarea.ant-input { &:focus, &-focused { box-shadow: none !important; - border-color: rgb(var(--primary-6)) !important; + border-color: $color-primary !important; } .ant-input { height: 30px; diff --git a/src/styles/components/ant-step.scss b/src/styles/components/ant-step.scss index 2eab583..e2061c1 100644 --- a/src/styles/components/ant-step.scss +++ b/src/styles/components/ant-step.scss @@ -53,4 +53,20 @@ } } } + &.ant-steps-dot { + .ant-steps-item-process { + .ant-steps-item-tail { + &::after { + background-color: #e6e6e8 !important; + } + } + } + .ant-steps-item-finish { + .ant-steps-item-tail { + &::after { + background-color: #6d4cfe !important; + } + } + } + } } diff --git a/src/styles/font.scss b/src/styles/font.scss index 3b1ea9a..28a9c4e 100644 --- a/src/styles/font.scss +++ b/src/styles/font.scss @@ -18,27 +18,27 @@ } .font-family-regular { - font-family: $font-family-regular; + font-family: $font-family-regular !important; } .font-family-medium { - font-family: $font-family-medium; + font-family: $font-family-medium !important; } .font-family-light { - font-family: $font-family-light; + font-family: $font-family-light !important; } .font-family-bold { - font-family: $font-family-bold; + font-family: $font-family-bold !important; } .font-family-manrope-regular { - font-family: $font-family-manrope-regular; + font-family: $font-family-manrope-regular !important; } .font-family-manrope-medium { - font-family: $font-family-manrope-medium; + font-family: $font-family-manrope-medium !important; } .font-family-manrope-bold { - font-family: $font-family-manrope-bold; + font-family: $font-family-manrope-bold !important; } .font-family-manrope-semiBold { - font-family: $font-family-manrope-semiBold; + font-family: $font-family-manrope-semiBold !important; } diff --git a/src/views/login/components/login-form/index.vue b/src/views/login/components/login-form/index.vue index 0dec9e4..f1c5410 100644 --- a/src/views/login/components/login-form/index.vue +++ b/src/views/login/components/login-form/index.vue @@ -33,7 +33,7 @@ -

+

{{ errMsg }}

@@ -43,7 +43,7 @@ -

+

{{ errMsg }}

@@ -263,9 +263,9 @@ const getCaptcha = async () => { }; // 验证码验证通过后 -const handleVerificationSubmit = () => { +const handleVerificationSubmit = async () => { isVerificationVisible.value = false; - postClearRateLimiter(); + await postClearRateLimiter(); getCaptcha(); }; diff --git a/src/views/login/components/register-form/index.vue b/src/views/login/components/register-form/index.vue index e9a0bb9..19a92c2 100644 --- a/src/views/login/components/register-form/index.vue +++ b/src/views/login/components/register-form/index.vue @@ -48,7 +48,7 @@ -

+

{{ errMsg }}

@@ -283,9 +283,9 @@ const getCaptcha = async () => { }; // 验证码验证通过后 -const handleVerificationSubmit = () => { +const handleVerificationSubmit = async () => { isVerificationVisible.value = false; - postClearRateLimiter(); + await postClearRateLimiter(); getCaptcha(); }; diff --git a/src/views/trial/img/icon-check.png b/src/views/trial/img/icon-check.png new file mode 100644 index 0000000..b859859 Binary files /dev/null and b/src/views/trial/img/icon-check.png differ diff --git a/src/views/trial/img/icon-info.png b/src/views/trial/img/icon-info.png new file mode 100644 index 0000000..677e49a Binary files /dev/null and b/src/views/trial/img/icon-info.png differ diff --git a/src/views/trial/index.vue b/src/views/trial/index.vue new file mode 100644 index 0000000..77832e3 --- /dev/null +++ b/src/views/trial/index.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/src/views/trial/style.scss b/src/views/trial/style.scss new file mode 100644 index 0000000..9531a7a --- /dev/null +++ b/src/views/trial/style.scss @@ -0,0 +1,95 @@ +.trial-wrap { + background: transparent; + min-width: 1200px; + .cts { + color: #211f24; + font-family: $font-family-medium; + font-size: 14px; + font-style: normal; + font-weight: 500; + line-height: 22px; + } + :deep(.ant-steps) { + .ant-steps-item { + margin-left: 0; + .ant-steps-item-icon { + width: 10px; + height: 10px; + } + .ant-steps-item-content { + margin-top: 8px; + .ant-steps-item-title { + color: var(--Text-1, #211f24); + font-family: $font-family-regular; + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: 24px; + } + .ant-steps-item-description { + color: var(--Text-3, #737478); + font-family: $font-family-regular; + font-size: 14px; + font-style: normal; + font-weight: 400; + line-height: 22px; + } + } + &.ant-steps-item-wait { + .ant-steps-icon { + .ant-steps-icon-dot { + background: #d7d7d9; + } + } + } + &.ant-steps-item-active, + &.ant-steps-item-finish { + .ant-steps-icon { + .ant-steps-icon-dot { + background: #6d4cfe; + } + } + .ant-steps-item-content { + .ant-steps-item-title { + padding: 0; + font-family: $font-family-medium; + } + } + } + } + } + .header-wrap { + background: transparent; + height: $navbar-height; + line-height: $navbar-height; + padding-inline: inherit; + color: inherit; + width: 100%; + min-width: $layout-min-width; + :deep(.right-wrap) { + .task-icon, + .agent-entry { + display: none; + } + } + } + .trial-content { + width: 100%; + height: 100%; + background: transparent; + min-height: calc(100vh - $navbar-height); + :deep(.ant-form) { + .ant-form-item { + &:not(:last-child) { + margin-bottom: 24px !important; + } + .ant-form-item-label { + > label { + font-family: $font-family-medium; + font-weight: 500; + } + } + } + } + } +}