From 47a818eddb2bdaf98d7c083c940b97ed39dc3ffa Mon Sep 17 00:00:00 2001 From: Tamara Date: Fri, 16 Feb 2024 03:11:28 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BA=D0=B0?= =?UTF-8?q?=D1=80=D1=82=D0=B8=D0=BD=D0=BE=D0=BA=20=D0=B2=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=B0=D1=85=20=D0=B7?= =?UTF-8?q?=D0=B0=D1=8F=D0=B2=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/QuizAnswersPage/CardAnswer.tsx | 38 +++++++++++++++---- src/pages/QuizAnswersPage/QuizAnswersPage.tsx | 2 + 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/pages/QuizAnswersPage/CardAnswer.tsx b/src/pages/QuizAnswersPage/CardAnswer.tsx index 2a91d7cf..f646cfce 100644 --- a/src/pages/QuizAnswersPage/CardAnswer.tsx +++ b/src/pages/QuizAnswersPage/CardAnswer.tsx @@ -22,6 +22,7 @@ import { deleteResult, obsolescenceResult } from "@root/results/actions"; import { resultApi } from "@api/result"; import { useQuizStore } from "@root/quizes/store"; import { useQuestionsStore } from "@root/questions/store"; +import AddressIcon from "@icons/ContactFormIcon/AddressIcon"; interface Props { isNew: boolean; @@ -32,6 +33,7 @@ interface Props { name?: string; phone?: string; email?: string; + address?: string; onLossNew?: (id: string) => void; } @@ -39,6 +41,7 @@ export const CardAnswer = ({ name, phone, email, + address, isNew = true, idResult, timeResult, @@ -194,6 +197,14 @@ export const CardAnswer = ({ )} + {address && ( + + + + {address} + + + )} {!isTablet && isNew && ( @@ -430,6 +441,7 @@ export const CardAnswer = ({ {questionsResultState.map((res) => { + console.log(questionsResultState, "что за результат тут"); return ( - {res.description || "нет заголовка"} + {res.description} - {res.title || "нет текста"} + {res.title} - {"хороший + {res.content.useImage && + res.content.back && + res.content.back !== " " && ( + {""} + )} + {!res.content.useImage && + res.content.back && + res.content.back !== " " && ( + + )} ); })} diff --git a/src/pages/QuizAnswersPage/QuizAnswersPage.tsx b/src/pages/QuizAnswersPage/QuizAnswersPage.tsx index 02bf93a1..fd558026 100644 --- a/src/pages/QuizAnswersPage/QuizAnswersPage.tsx +++ b/src/pages/QuizAnswersPage/QuizAnswersPage.tsx @@ -335,6 +335,8 @@ export const QuizAnswersPage: FC = () => {