From 1e627afe2e904c157d1675a511d6053e7f5439c0 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Wed, 24 Jul 2024 09:33:19 +0300 Subject: [PATCH 1/4] min length --- components/calcValues.vue | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/components/calcValues.vue b/components/calcValues.vue index d7af960..782368d 100644 --- a/components/calcValues.vue +++ b/components/calcValues.vue @@ -51,12 +51,7 @@ const form_refs = { } const changeParametres = () => { - console.log(form_state.total_length * 1000, copy_form_state.total_length * 1000) - - if ((form_state.total_length * 1000) <= (parametric.length.min + parametric.height.step)) { - form_state.total_length = (parametric.length.min + parametric.height.step) / 1000 - // return - } + // console.log(form_state.total_length * 1000, copy_form_state.total_length * 1000) const lamelles = Math.floor(form_state.height / parametric.height.step) @@ -79,6 +74,7 @@ const changeParametres = () => { let { fence_length, total_length_mm, auto_length, length, full_sections } = form_state length = parseFloat(length.toString()) + if (total_length_mm < parametric.length.min) total_length_mm = parametric.length.min if (auto_length) { let w = parametric.length.min @@ -152,13 +148,13 @@ const goal = (target: string, params: object) => {
- +
- +
@@ -188,6 +184,9 @@ const goal = (target: string, params: object) => { v-model="form_state.total_length" :ref="form_refs.total_length" />
+

+ Длина забора слишком мала +

Внимание! Дополнительная секция приводит к увеличению стоимости. Рекомендуем вам изменить длину забора или длину секции! -- 2.40.1 From 8a5ea6420d46063bf83f59679a159eb3cece3e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=90=D0=BD=D0=B0=D1=81=D1=82=D0=B0=D1=81=D0=B8=D1=8F=20=D0=9D?= =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5=D0=B2=D0=BD=D0=B0?= Date: Wed, 24 Jul 2024 09:42:31 +0300 Subject: [PATCH 2/4] text --- components/calcValues.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/calcValues.vue b/components/calcValues.vue index 782368d..08053bf 100644 --- a/components/calcValues.vue +++ b/components/calcValues.vue @@ -185,7 +185,7 @@ const goal = (target: string, params: object) => {

- Длина забора слишком мала + Выбранный размер забора слишком мал для расчета стоимости. Пожалуйста, выберите больший размер, чтобы продолжить.

Внимание! Дополнительная секция приводит к увеличению стоимости. -- 2.40.1 From 0cbcac951d4244296dd14cc4fc8935f370c16e6b Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Wed, 24 Jul 2024 09:45:37 +0300 Subject: [PATCH 3/4] overflow modal --- assets/main.scss | 9 ++++++++- components/calcValues.vue | 5 +++++ components/modal.vue | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/assets/main.scss b/assets/main.scss index e365143..6c23270 100644 --- a/assets/main.scss +++ b/assets/main.scss @@ -12,6 +12,9 @@ html { body { @apply select-none min-w-80 font-sans; + &.modal-opened { + @apply overflow-hidden; + } } .container { @@ -210,7 +213,7 @@ a[href^="#"] { &-image { @apply max-w-full max-h-full aspect-square overflow-hidden col-span-1 pr-4; - img{ + img { @apply rounded-full bg-slate-300 } } @@ -247,6 +250,10 @@ a[href^="#"] { } } + &-content { + @apply max-h-[66vh] overflow-auto; + } + h2 { @apply px-6 text-2xl text-center; } diff --git a/components/calcValues.vue b/components/calcValues.vue index 782368d..fd160e8 100644 --- a/components/calcValues.vue +++ b/components/calcValues.vue @@ -133,6 +133,11 @@ watch(() => form_state, changeParametres, { deep: true }) const isModalOpen = useState('modal_open', () => false) const toggleModal = () => { isModalOpen.value = !isModalOpen.value + if(isModalOpen.value == true) { + document.body.classList.add('modal-opened') + } else { + document.body.classList.remove('modal-opened') + } } const goal = (target: string, params: object) => { const nuxtApp = useNuxtApp() diff --git a/components/modal.vue b/components/modal.vue index 76e2c70..c362e87 100644 --- a/components/modal.vue +++ b/components/modal.vue @@ -208,7 +208,7 @@ const policy = () => {