WIP Переделала инпуты

This commit is contained in:
Daria Golova
2023-07-13 18:36:28 +03:00
parent f0640b6a3d
commit 25dbf78915
8 changed files with 260 additions and 49 deletions

View File

@@ -11,29 +11,24 @@
) Войдите в аккаунт, чтобы начать пользоваться сервисом «Астра».
.flex.flex-col.gap-y-5
.flex.flex-col.gap-y-px
base-input.input(
:rule="[wrongData => !!wrongData]",
base-input.blue-color(
:rule="[wrongData => !!wrongData || 'Этого телефона нет в системе']",
v-model="user.username",
placeholder="+7 (915) 2242131",
label="Номер телефона",
outlined,
no-error-icon
size="L"
)
.red-color.text-smm.font-semibold(v-if="wrongData") Этого телефона нет в системе
.flex.flex-col.gap-y-px
base-input.input(
:rule="[wrongData => !!wrongData]",
base-input.blue-color(
:rule="[wrongData => !!wrongData || 'Неверный пароль']",
v-model="user.password",
:type="changeType",
placeholder="Введите ваш пароль",
label="Пароль",
outlined,
no-error-icon
size="L"
)
.flex.items-center.cursor-pointer(@click="changeView", v-if="!wrongData && user.password")
img(:src="eye_close", v-if="!isView")
img(:src="eye_open", v-else)
.red-color.text-smm.font-semibold(v-if="wrongData") Неверный пароль
img(:src="!isView ? eye_close : eye_open")
.flex.items-center.gap-x-8px.-ml-2
q-checkbox(@click="persist", v-model="person", type="checkbox")
.flex.non-italic.font-medium.base Запомнить меня
@@ -49,11 +44,11 @@
<script>
import { fetchWrapper } from "@/shared/fetchWrapper";
import BaseInput from "@/components/base/BaseInput";
import logoMark from "@/assets/images/logoMark.svg";
import BaseButton from "@/components/base/BaseButton.vue";
import eye_open from "@/assets/icons/eye_open.svg";
import eye_close from "@/assets/icons/eye_close.svg";
import BaseInput from "@/components/BaseInput.vue";
export default {
name: "TheLogin",
@@ -161,15 +156,6 @@ export default {
.q-btn
height: 48px
.input :deep(.label)
opacity: 1
.blue-color :deep(.label)
color: var(--font-dark-blue-color)
line-height: 135%
.input :deep(.q-field__control)
color: var(--font-dark-blue-color)
&:hover:before
border: 1px solid var(--font-dark-blue-color)
&:after
border-width: 1px !important
</style>

View File

@@ -1,14 +1,12 @@
<template lang="pug">
.calendar-header-wrapper.w-full.flex.items-center.p-4.justify-between
base-input(
base-input.search(
iconLeft,
outlined,
:width="280",
size="M",
placeholder="Найти ...",
fontSize="16px",
lineHeight="19px"
)
q-icon(name="app:icon-search", size="20px")
q-icon(name="app:search", size="20px")
.flex.gap-x-4.items-center.justify-center
q-btn(
color="secondary",
@@ -20,26 +18,23 @@
padding="2px 11px 2px 8px",
@click="previousWeek"
)
base-input(
outlined,
base-input.search(
size="M"
:width="300",
fontSize="16px",
lineHeight="19px",
iconRight,
v-model="currentWeek",
readonly
)
.h-5.w-5.flex.items-center.justify-center
q-icon.text.cursor-pointer(:name="calendarVisibility ? 'app:cancel' : 'app:calendar'",
:size="calendarVisibility ? '10px' : '16px'",
:size="calendarVisibility ? '12px' : '18px'",
)
q-menu(
:style="{'margin-top': '4px !important'}"
:style="{'margin-top': '8px !important'}"
v-model="calendarVisibility",
transition-show="scale",
transition-hide="scale"
self="top middle",
:offset="[122, 14]"
:offset="[118, 14]"
)
base-calendar(
v-model="dates",
@@ -74,11 +69,11 @@
</template>
<script>
import BaseInput from "@/components/base/BaseInput";
import BaseCalendar from "@/components/base/Calendar/BaseCalendar.vue";
import { mapState, mapActions } from "vuex";
import { v_model } from "@/shared/mixins/v-model";
import DateSwitcherSvg from "@/pages/newCalendar/components/CalendarDateSwitcherSvg.vue";
import BaseInput from "@/components/BaseInput.vue";
export default {
name: "CalendarHeader",
mixins: [v_model],
@@ -179,6 +174,12 @@ export default {
.q-btn-group :deep(.q-btn-item)
border-radius: 4px !important
.search :deep(.q-field__marginal)
height: auto !important
.search :deep(.q-field__prepend)
padding-right: 6px !important
</style>
<style lang="sass">
.q-field--outlined.q-field--readonly .q-field__control:before

View File

@@ -56,7 +56,7 @@
:rule="[(val) => !personDataField.includes(field.key) ? checkPassportFields(val, field.rules) : field.rules(val)]",
:autogrow="field.key === 'issued_by_org'"
)
.icon-copy.my-auto.text-lg.label-field(
.icon-copy.my-auto.text-lg.label-field.cursor-pointer(
v-if="checkCopiedFields(field.key) && !!docData[data.dataKey][field.key]",
@click="copyValue(docData[data.dataKey][field.key])"
)