Skip to content

M
mr-julyedu
Commit 34e507f4 by FE
Options

solve conflict 03

parent 5a7a7a7f
Showing with 0 additions and 12 deletions
src/components/video/video-catalog/index.js
...@@ -35,23 +35,11 @@ class VideoCatalog extends Component { ...@@ -35,23 +35,11 @@ class VideoCatalog extends Component {
</div> </div>
{ {
(item.practice && item.practice.qid) (item.practice && item.practice.qid)
<<<<<<< HEAD
? <Link
to={{
pathname: item.practice.is_tested ? '/campResolve' : '/campTest',
search: `?keshi_id=${item.id}&qid=${item.practice.qid}`,
state: {
from: `/play/video${window.location.search}`
}
}}
>
=======
? <Link to={{ ? <Link to={{
pathname: item.practice.is_tested ? '/campResolve' : '/campTest', pathname: item.practice.is_tested ? '/campResolve' : '/campTest',
search: `?keshi_id=${item.id}&qid=${item.practice.qid}`, search: `?keshi_id=${item.id}&qid=${item.practice.qid}`,
state: {from: `/play/video${window.location.search}`} state: {from: `/play/video${window.location.search}`}
}}> }}>
>>>>>>> ef91ba3d8a0a94933546e5e626e4683a35469b0d
<div className="exercise"> <div className="exercise">
课后练习：{item.practice.title} 课后练习：{item.practice.title}
<i className={classnames('iconfont',!item.video_auth ? 'iconiconfront-74' : item.practice.is_tested ? 'iconiconfront-3' : '')}/> <i className={classnames('iconfont',!item.video_auth ? 'iconiconfront-74' : item.practice.is_tested ? 'iconiconfront-3' : '')}/>
......
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