Skip to content

M
mr-julyedu
Commit 5a7a7a7f by FE
Options

solve conflict

parent 720aa44a
Showing with 0 additions and 4 deletions
src/components/video/camp/campTest.js
...@@ -71,7 +71,6 @@ class CampTest extends Component { ...@@ -71,7 +71,6 @@ class CampTest extends Component {
this.body = document.getElementsByTagName('body')[0]; this.body = document.getElementsByTagName('body')[0];
this.body.style.position = 'static'; this.body.style.position = 'static';
} else { } else {
<<<<<<< HEAD
const { history, location: { state={} } } = this.props; const { history, location: { state={} } } = this.props;
let to = ''; let to = '';
if(state.from && state.from.indexOf('video') !== -1) { if(state.from && state.from.indexOf('video') !== -1) {
...@@ -87,9 +86,6 @@ class CampTest extends Component { ...@@ -87,9 +86,6 @@ class CampTest extends Component {
to to
} }
); );
=======
this.props.history.push(`${this.props.location.state.from}`,{href: '/classify'})
>>>>>>> ef91ba3d8a0a94933546e5e626e4683a35469b0d
} }
}; };
// 选择答案 // 选择答案
......
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