renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/0905_登录注册流程重构' into test

Browse Source
This commit is contained in:
rd
2025-09-18 10:06:16 +08:00
parent e4f0f8b23f 8d57d555b4
commit b9396e0ce5
4 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/layouts/components/navbar/components/right-side/index.vue
View File

@ -65,7 +65,7 @@
<template v-else>
<template v-if="item.audit_status === 1">
<div class="w-full h-1px bg-#E6E6E8 mb-8px" v-if="enterprises.length > 0"></div>
<div v-if="enterprises.length > 1" class="w-full h-1px bg-#E6E6E8 mb-8px"></div>
<MenuItem class="rounded-8px hover:bg-#F2F3F5 h-36px !mb-0" @click="onCreate(item)">
<div class="flex items-center">
<SvgIcon size="16.5" name="svg-organization" class="color-#737478 mr-8px" />

42
src/styles/components/ant-input.scss
View File

@ -70,6 +70,22 @@ textarea.ant-input {
padding-top: 0;
padding-bottom: 0;
@include box;
.ant-input-suffix {
.ant-input-show-count-suffix {
color: var(--Text-4, #939499);
font-family: font-family-manrope-regular;
font-size: 12px;
font-style: normal;
font-weight: 400;
line-height: 20px;
}
.ant-input-clear-icon {
visibility: hidden;
}
}
&.ant-input-affix-wrapper-disabled {
background-color: var(--BG-200, #f2f3f5) !important;
}
@ -81,15 +97,27 @@ textarea.ant-input {
&:hover {
border-color: $color-primary !important;
.ant-input-clear-icon {
&:not(.ant-input-clear-icon-hidden) {
visibility: visible;
}
}
}
}
&:focus,
&-focused {
box-shadow: none !important;
border-color: $color-primary !important;
.ant-input-clear-icon {
&:not(.ant-input-clear-icon-hidden) {
visibility: visible;
}
}
}
.ant-input {
height: 30px;
&.ant-input-lg {
@ -99,14 +127,4 @@ textarea.ant-input {
height: 26px;
}
}
.ant-input-suffix {
.ant-input-show-count-suffix {
color: var(--Text-4, #939499);
font-family: font-family-manrope-regular;
font-size: 12px;
font-style: normal;
font-weight: 400;
line-height: 20px;
}
}
}

2
src/views/trial/index.vue
View File

@ -10,7 +10,7 @@
</div>
</div>
</Layout.Header>
<Layout class="flex trial-content items-center">
<Layout class="flex trial-content items-center mt-24px">
<div class="w-800px">
<!-- 未建联 -->
<section class="w-full" v-if="!primary_enterprise">

26
src/views/trial/style.scss
View File

@ -12,14 +12,18 @@
:deep(.ant-steps) {
.ant-steps-item {
margin-left: 0;
.ant-steps-item-icon {
width: 10px;
height: 10px;
}
.ant-steps-item-container {
cursor: text;
.ant-steps-item-icon {
width: 10px;
height: 10px;
}
.ant-steps-item-content {
margin-top: 8px;
.ant-steps-item-title {
color: var(--Text-1, #211f24);
color: var(--Text-1, #211f24) !important;
font-family: $font-family-regular;
font-size: 16px;
font-style: normal;
@ -27,7 +31,7 @@
line-height: 24px;
}
.ant-steps-item-description {
color: var(--Text-3, #737478);
color: var(--Text-3, #737478) !important;
font-family: $font-family-regular;
font-size: 14px;
font-style: normal;
@ -35,6 +39,16 @@
line-height: 22px;
}
}
.ant-steps-item-tail {
top: 4px;
&::after {
height: 1px !important;
}
}
}
&.ant-steps-item-wait {
.ant-steps-icon {
.ant-steps-icon-dot {