Commit 9be9b6fb authored by 文旺-丰林-DEV's avatar 文旺-丰林-DEV

fixd conflict

parent bd718020
...@@ -12,51 +12,32 @@ interface IAnswerProps { ...@@ -12,51 +12,32 @@ interface IAnswerProps {
const { useBreakpoint } = Grid; const { useBreakpoint } = Grid;
const Answer = (props: IAnswerProps) => { const Answer = (props: IAnswerProps) => {
<<<<<<< Updated upstream const { answerValue, isShowRetry } = props;
const { answerValue, loading, isShowRetry } = props
const screens = useBreakpoint(); const screens = useBreakpoint();
const isMobile = screens.xs; const isMobile = screens.xs;
console.log('isMobile', isMobile) console.log('isMobile', isMobile);
=======
const { answerValue, isShowRetry } = props;
>>>>>>> Stashed changes
return ( return (
<div> <div>
<p className={styles.question} style={{ marginTop: isMobile ? '20px' : '40px' }}> <p className={styles.question} style={{ marginTop: isMobile ? '20px' : '40px' }}>
<img src={logoSvg} alt="" className={styles.question_img } /> <img src={logoSvg} alt="" className={styles.question_img} />
<span className={classNames(isMobile && styles.mobile_question_span, styles.question_span)} style={{ marginLeft: isMobile ? '8px' : '16px' }}>回答如下:</span> <span
className={classNames(isMobile && styles.mobile_question_span, styles.question_span)}
style={{ marginLeft: isMobile ? '8px' : '16px' }}
>
回答如下:
</span>
</p> </p>
<div className={styles.chat}> <div className={styles.chat}>
<<<<<<< Updated upstream
<div className={classNames(styles.answer, isMobile && styles.mobile_answer)}> <div className={classNames(styles.answer, isMobile && styles.mobile_answer)}>
{ {!isMobile && (
!isMobile && <p className={styles.copyAnswer} onClick={() => {}}>
<p <img src={copySvg} alt="" />
className={styles.copyAnswer} <span>复制回答</span>
onClick={() => { </p>
)}
}}
>
<img src={copySvg} alt="" />
<span>复制回答</span>
</p>
}
<p className={styles.answerValue}>{loading ? '请耐心等待3-5秒~' : answerValue}</p>
</div>
{
isShowRetry && !isMobile && <Button className={styles.chat_retry}>重试</Button>
}
=======
<div>
<p className={styles.copyAnswer} onClick={() => {}}>
<img src={copySvg} alt="" />
<span>复制回答</span>
</p>
<div className={styles.answer}> <div className={styles.answer}>
{!answerValue ? ( {!answerValue ? (
<p>请耐心等待3-5秒~</p> <p>请耐心等待3-5秒~</p>
...@@ -65,23 +46,17 @@ const Answer = (props: IAnswerProps) => { ...@@ -65,23 +46,17 @@ const Answer = (props: IAnswerProps) => {
)} )}
</div> </div>
</div> </div>
{isShowRetry && <Button>重试</Button>} {isShowRetry && !isMobile && <Button className={styles.chat_retry}>重试</Button>}
>>>>>>> Stashed changes
</div> </div>
{ {isMobile && (
isMobile && <div className={styles.mobile_button}>
<div className={styles.mobile_button}> <Button className={styles.mobile_copyAnswer}>
<Button className={styles.mobile_copyAnswer}> <img src={copySvg} alt="" />
<img src={copySvg} alt="" /> <span>复制回答</span>
<span>复制回答</span> </Button>
</Button> <Button className={styles.mobile_chat_retry}>重试</Button>
<Button </div>
className={styles.mobile_chat_retry} )}
>
重试
</Button>
</div>
}
</div> </div>
); );
}; };
......
@import (reference) '~antd/es/style/themes/index'; @import (reference) '~antd/es/style/themes/index';
.mobile_newSession { .mobile_newSession {
padding: 48px 16px 16px;
width: 100% !important; width: 100% !important;
padding: 48px 16px 16px;
} }
.mobile_question_span { .mobile_question_span {
...@@ -25,21 +25,11 @@ ...@@ -25,21 +25,11 @@
width: 26px; width: 26px;
height: 26px; height: 26px;
} }
<<<<<<< Updated upstream
.question_span { .question_span {
font-size: 20px;
font-weight: 600;
line-height: 26px;
color: #333333;
=======
span {
height: 28px;
margin-left: 16px;
color: #333333; color: #333333;
font-weight: 600; font-weight: 600;
font-size: 20px; font-size: 20px;
line-height: 26px; line-height: 26px;
>>>>>>> Stashed changes
} }
} }
...@@ -48,13 +38,13 @@ ...@@ -48,13 +38,13 @@
.answer { .answer {
position: relative; position: relative;
width: 900px; width: 900px;
min-height: 268px;
margin-left: 28px; margin-left: 28px;
background: #F0F3F6; color: rgba(0, 0, 0, 0.85);
border-radius: 4px;
font-size: 18px; font-size: 18px;
color: rgba(0,0,0,0.85);
line-height: 32px; line-height: 32px;
min-height: 268px; background: #f0f3f6;
border-radius: 4px;
.copyAnswer { .copyAnswer {
position: absolute; position: absolute;
right: 16px; right: 16px;
...@@ -73,23 +63,8 @@ ...@@ -73,23 +63,8 @@
} }
} }
<<<<<<< Updated upstream
.answerValue { .answerValue {
padding: 16px; padding: 16px;
=======
.answer {
width: 900px;
min-height: 268px;
margin-left: 28px;
color: rgba(0, 0, 0, 0.85);
font-size: 18px;
line-height: 32px;
background: #f0f3f6;
border-radius: 4px;
p {
padding: 16px;
}
>>>>>>> Stashed changes
} }
} }
.chat_retry { .chat_retry {
...@@ -110,7 +85,6 @@ ...@@ -110,7 +85,6 @@
} }
} }
} }
<<<<<<< Updated upstream
.mobile_button { .mobile_button {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
...@@ -119,29 +93,26 @@ ...@@ -119,29 +93,26 @@
.mobile_copyAnswer { .mobile_copyAnswer {
width: 151px; width: 151px;
height: 40px; height: 40px;
background: rgba(0,155,149,0.12); background: rgba(0, 155, 149, 0.12);
border-radius: 4px; border-radius: 4px;
img { img {
width: 24px; width: 24px;
height: 24px; height: 24px;
} }
span { span {
color: #009B95;
line-height: 20px;
height: 24px; height: 24px;
color: #009b95;
font-size: 14px; font-size: 14px;
line-height: 20px;
} }
} }
.mobile_chat_retry { .mobile_chat_retry {
width: 151px; width: 151px;
height: 40px; height: 40px;
background: #FFFFFF; color: #009b95;
background: #ffffff;
border: 1px solid #009b95;
border-radius: 4px; border-radius: 4px;
border: 1px solid #009B95;
color: #009B95;
} }
} }
} }
=======
}
>>>>>>> Stashed changes
...@@ -18,41 +18,9 @@ const NewSession = (props: INewSessionProps) => { ...@@ -18,41 +18,9 @@ const NewSession = (props: INewSessionProps) => {
const isMobile = screens.xs; const isMobile = screens.xs;
return ( return (
<<<<<<< Updated upstream
<div className={classNames(isMobile && styles.mobile_newSession, styles.newSession)}> <div className={classNames(isMobile && styles.mobile_newSession, styles.newSession)}>
<Issue
questionValue={questionValue}
/>
<Answer
answerValue={answerValue}
loading
/>
<Issue
questionValue={questionValue}
/>
<Answer
answerValue={answerValue}
loading
/>
<Issue
questionValue={questionValue}
/>
<Answer
answerValue={answerValue}
loading
/>
<Issue
questionValue={questionValue}
/>
<Answer
answerValue={answerValue}
loading
/>
=======
<div className={styles.newSession}>
<Issue questionValue={questionValue} /> <Issue questionValue={questionValue} />
<Answer answerValue={answerValue} /> <Answer answerValue={answerValue} />
>>>>>>> Stashed changes
</div> </div>
); );
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment