提交 47718a30 authored 作者: 王绍森's avatar 王绍森

增加选择错误后的跳转

上级 8dc11014
...@@ -44,16 +44,14 @@ const CorrectMark = styled(MarkImg)` ...@@ -44,16 +44,14 @@ const CorrectMark = styled(MarkImg)`
`; `;
const CheckBtn = withRouter(({ w, h, leftGap, bg, to, history }) => { const CheckBtn = withRouter(({ w, h, leftGap, bg, to, correct, history }) => {
const [showCheckMark, setShowCheckMark] = useState(false); const [showCheckMark, setShowCheckMark] = useState(false);
function handleClick(e) { function handleClick(e) {
e.preventDefault(); e.preventDefault();
setShowCheckMark(true); setShowCheckMark(true);
if(to !== '#') { setTimeout(() => {
setTimeout(() => { history.push(to);
history.push(to); }, 1000);
}, 500);
}
} }
return ( return (
<StyledBtn <StyledBtn
...@@ -65,7 +63,7 @@ const CheckBtn = withRouter(({ w, h, leftGap, bg, to, history }) => { ...@@ -65,7 +63,7 @@ const CheckBtn = withRouter(({ w, h, leftGap, bg, to, history }) => {
onClick={e => handleClick(e)} onClick={e => handleClick(e)}
> >
{ {
to !== '#' ? <CorrectMark show={showCheckMark} src={CorrectImg} /> : <WrongMark show={showCheckMark} src={WrongImg} /> correct ? <CorrectMark show={showCheckMark} src={CorrectImg} /> : <WrongMark show={showCheckMark} src={WrongImg} />
} }
</StyledBtn> </StyledBtn>
); );
...@@ -107,7 +105,8 @@ export default function CheckLack({ config }) { ...@@ -107,7 +105,8 @@ export default function CheckLack({ config }) {
h={config.btns.h} h={config.btns.h}
leftGap={config.btns.leftGap} leftGap={config.btns.leftGap}
bg={ele.bg} bg={ele.bg}
to={ele.to || '#'} correct={ele.correct}
to={ele.to}
/> />
)) ))
} }
......
...@@ -35,7 +35,9 @@ export default function (idx) { ...@@ -35,7 +35,9 @@ export default function (idx) {
] ]
} }
} }
config.btns.rows[0][idx].to = match.url+'/info'; const cornList = ['n', 'p', 'k', 'zn', 'b'];
config.btns.rows[0][idx].correct = true;
config.btns.rows[0].forEach((ele, i) => ele.to = `/corn/lack-of-${cornList[i]}/info`);
return <CheckLack config={config} />; return <CheckLack config={config} />;
}); });
return Component; return Component;
......
...@@ -49,7 +49,16 @@ export default function (lackElement) { ...@@ -49,7 +49,16 @@ export default function (lackElement) {
] ]
} }
} }
config.btns.rows[lackElement[0]][lackElement[1]].to = match.url+'/info'; const rapeList = [
['n', 'p', 'k', 'ga',],
['mg', 'zn', 'b', 's']
];
config.btns.rows[lackElement[0]][lackElement[1]].correct = true;
config.btns.rows.forEach((r, i) => {
r.forEach((ele, j) => {
ele.to = `/rape/lack-of-${rapeList[i][j]}/info`
});
});
return <CheckLack config={config} />; return <CheckLack config={config} />;
}); });
return Component; return Component;
......
...@@ -43,7 +43,11 @@ export default function(idx) { ...@@ -43,7 +43,11 @@ export default function(idx) {
] ]
} }
} }
config.btns.rows[0][idx].to = match.url+'/info'; config.btns.rows[0][idx].correct = true;
const tomatoList = ['n', 'p', 'k', 'ga', 'mg', 'zn', 'b', 's', 'mu'];
config.btns.rows[0].forEach((ele, i) => {
ele.to = `/tomato/lack-of-${tomatoList[i]}/info`
});
return <CheckLack config={config} />; return <CheckLack config={config} />;
}); });
return Component; return Component;
......
...@@ -26,6 +26,7 @@ const bgs = [ N_Bg, P_Bg, K_Bg, Ga_Bg, Mg_Bg, Zn_Bg, B_Bg, Mn_Bg, Fe_Bg, ] ...@@ -26,6 +26,7 @@ const bgs = [ N_Bg, P_Bg, K_Bg, Ga_Bg, Mg_Bg, Zn_Bg, B_Bg, Mn_Bg, Fe_Bg, ]
export default function (idx) { export default function (idx) {
const Component = withRouter(({ match }) => { const Component = withRouter(({ match }) => {
const to = match.url+'/info'
const config = { const config = {
bg: bgs[idx], bg: bgs[idx],
btns: { btns: {
...@@ -36,12 +37,16 @@ export default function (idx) { ...@@ -36,12 +37,16 @@ export default function (idx) {
leftGap: 48, leftGap: 48,
rows: [ rows: [
[ [
{ bg: N_Btn_Bg }, { bg: P_Btn_Bg }, { bg: K_Btn_Bg }, { bg: Ga_Btn_Bg }, { bg: Mg_Btn_Bg }, { bg: Zn_Btn_Bg }, { bg: B_Btn_Bg }, { bg: Mn_Btn_Bg }, { bg: Fe_Btn_Bg }, { bg: N_Btn_Bg, to }, { bg: P_Btn_Bg, to }, { bg: K_Btn_Bg, to }, { bg: Ga_Btn_Bg, to }, { bg: Mg_Btn_Bg, to }, { bg: Zn_Btn_Bg, to }, { bg: B_Btn_Bg, to }, { bg: Mn_Btn_Bg, to }, { bg: Fe_Btn_Bg, to },
], ],
] ]
} }
} }
config.btns.rows[0][idx].to = match.url+'/info'; config.btns.rows[0][idx].correct = true;
const wheatList = ['n', 'p', 'k', 'ga', 'mg', 'zn', 'b', 'mn', 'fe'];
config.btns.rows[0].forEach((ele, i) => {
ele.to = `/wheat/lack-of-${wheatList[i]}/info`
});
return <CheckLack config={config} />; return <CheckLack config={config} />;
}); });
return Component; return Component;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论