Merge branch 'issuevp'

src/components/video/video-catalog/index.js

@@ -35,31 +35,49 @@ class VideoCatalog extends Component {
                                     </div>
                                     {
                                         this.props.isAist ? (
-                                            (item.practice && item.practice.qid)
-                                            ? <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}`}
-                                            }}>
-                                                <div className="exercise">
-                                                    课后练习：{item.practice.title}
-                                                    <i className={classnames('iconfont',!item.video_auth ? 'iconiconfront-74' : item.practice.is_tested ? 'iconiconfront-3' : '')}/>
-                                                </div>
-                                            </Link>
-                                            : null
+                                            item.video_auth ? (
+                                                (item.practice && item.practice.qid)
+                                                ? <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}`}
+                                                }}>
+                                                    <div className="exercise">
+                                                        课后练习：{item.practice.title}
+                                                        <i className={classnames('iconfont', item.practice.is_tested ? 'iconiconfront-3' : '')}/>
+                                                    </div>
+                                                </Link>
+                                                : null
+                                            ) : (
+                                                <a href="javascript:void(0)">
+                                                    <div className="exercise">
+                                                        课后练习：{item.practice.title}
+                                                        <i className={classnames('iconfont','iconiconfront-74')}/>
+                                                    </div>
+                                                </a>
+                                            )
                                         ) : (
                                             item.practice_common.map((commonItem, index) => {
                                                 return (
-                                                    <Link to={{
-                                                        pathname: commonItem.is_tested ? '/campResolve' : '/campTest',
-                                                        search: `?keshi_id=${item.id}&qid=${commonItem.qid}`,
-                                                        state: {from: `/play/video${window.location.search}`}
-                                                    }} key={index}>
-                                                        <div className="exercise">
-                                                            课后练习：{commonItem.title}
-                                                            <i className={classnames('iconfont',!item.video_auth ? 'iconiconfront-74' : commonItem.is_tested ? 'iconiconfront-3' : '')}/>
-                                                        </div>
-                                                    </Link>
+                                                    item.video_auth ? (
+                                                        <Link to={{
+                                                            pathname: commonItem.is_tested ? '/campResolve' : '/campTest',
+                                                            search: `?keshi_id=${item.id}&qid=${commonItem.qid}`,
+                                                            state: {from: `/play/video${window.location.search}`}
+                                                        }} key={index}>
+                                                            <div className="exercise">
+                                                                课后练习：{commonItem.title}
+                                                                <i className={classnames('iconfont',commonItem.is_tested ? 'iconiconfront-3' : '')}/>
+                                                            </div>
+                                                        </Link>
+                                                    ) : (
+                                                        <a href="javascript:void(0)">
+                                                            <div className="exercise">
+                                                                课后练习：{commonItem.title}
+                                                                <i className={classnames('iconfont','iconiconfront-74')}/>
+                                                            </div>
+                                                        </a>
+                                                    )
                                                 )
                                             })
                                         )