From c03b6dc69b3e6cce5faf818b9e42e9da9f13879c Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Wed, 24 Jul 2024 10:22:00 +0300 Subject: [PATCH] predef color --- components/calcValues.vue | 11 +++++++++-- composables/useCalc.ts | 6 +++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/components/calcValues.vue b/components/calcValues.vue index 1aab197..ac898c3 100644 --- a/components/calcValues.vue +++ b/components/calcValues.vue @@ -15,6 +15,12 @@ const extra_section = use_extra_section() const total_length = use_total_length() const min_length = use_min_length() +if (!pillar_color.value) { + const r = Math.floor(Math.random() * predefPillarColors.length) + pillar_color.value = predefPillarColors[r] as ralTypes + lamelle_color.value = predefLamelleColors[r] as ralTypes +} + const parametric = reactive({ length: { min: min_length.value, @@ -130,7 +136,7 @@ watch(() => form_state, changeParametres, { deep: true }) const isModalOpen = useState('modal_open', () => false) const toggleModal = () => { isModalOpen.value = !isModalOpen.value - if(isModalOpen.value == true) { + if (isModalOpen.value == true) { document.body.classList.add('modal-opened') } else { document.body.classList.remove('modal-opened') @@ -187,7 +193,8 @@ const goal = (target: string, params: object) => {

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

Внимание! Дополнительная секция приводит к увеличению стоимости. diff --git a/composables/useCalc.ts b/composables/useCalc.ts index c8badf7..c11aef2 100644 --- a/composables/useCalc.ts +++ b/composables/useCalc.ts @@ -5,13 +5,13 @@ export const predefLamelleColors = ['3009', '9003', '6027', '5024', '9001', '101 const n = 2 const min = 1300 -const random_pair = Math.floor(Math.random() * predefPillarColors.length) + export const use_lamelle_height = () => useState('lamelle_height', () => 0.115) export const use_lamelles_count = () => useState('lamelles_count', () => 14) export const use_fence_section = () => useState('fence_section', () => min * 0.001) export const use_remove_pillar = () => useState('remove_pillar', () => false) -export const use_pillar_color = () => useState('pillar_color', () => predefPillarColors[random_pair] as ralTypes) -export const use_lamelle_color = () => useState('lamelle_color', () => predefLamelleColors[random_pair] as ralTypes) +export const use_pillar_color = () => useState('pillar_color') +export const use_lamelle_color = () => useState('lamelle_color') export const use_section_count = () => useState('section_count', () => n) export const use_extra_section = () => useState('extra_section', () => 0) export const use_total_length = () => useState('total_length', () => (((min + 104) * n) + 104) * 0.001)