Commit 19e77109 by xuzhenghua

bug

parent 054b9e4b
...@@ -140,10 +140,10 @@ class Index extends Component { ...@@ -140,10 +140,10 @@ class Index extends Component {
this.state.tabdata.map((item, index) => { this.state.tabdata.map((item, index) => {
return ( return (
<li key={index}> <li key={index}>
<Link to={item.href}> <a href={item.href}>
<img src={item.src} alt=""/> <img src={item.src} alt=""/>
<span>{item.name}</span> <span>{item.name}</span>
</Link> </a>
</li> </li>
) )
}) })
...@@ -201,11 +201,11 @@ function TopSwiper({bannerList}) { ...@@ -201,11 +201,11 @@ function TopSwiper({bannerList}) {
{bannerList && bannerList.length > 0 && bannerList.map((item, index) => { {bannerList && bannerList.length > 0 && bannerList.map((item, index) => {
return ( return (
Number.isNaN(parseInt(item.jump_url)) ? Number.isNaN(parseInt(item.jump_url)) ?
<Link to={item.jump_url} key={index}> <a href={item.jump_url} key={index}>
{/* <Link to={item.jump_url} key={index}> */} {/* <Link to={item.jump_url} key={index}> */}
<img className="item" src={item.name} alt=""/> <img className="item" src={item.name} alt=""/>
{/* </Link> */} {/* </Link> */}
</Link> : </a> :
<Link to={{pathname: '/detail', search: `?id=${item.jump_url}`}} key={index}> <Link to={{pathname: '/detail', search: `?id=${item.jump_url}`}} key={index}>
<img className="item" src={item.name} alt=""/> <img className="item" src={item.name} alt=""/>
</Link> </Link>
......
...@@ -556,7 +556,7 @@ function CourseBottom(props) { ...@@ -556,7 +556,7 @@ function CourseBottom(props) {
let Buttons let Buttons
if (props.item.bargain_status === 2) { if (props.item.bargain_status === 2) {
// Buttons = <Link to={`/detail?id=${props.item.course_id}`} className={'bargain'}>我要砍价</Link> // Buttons = <Link to={`/detail?id=${props.item.course_id}`} className={'bargain'}>我要砍价</Link>
Buttons = <a href="javascript:;" onClick={() => props.toDetail(props.item.course_id)} className={'bargain bargian-study'}>我要砍价</a> Buttons = <a onClick={() => props.toDetail(props.item.course_id)} className={'bargain bargian-study'}>我要砍价</a>
} else if (props.item.bargain_status === 3) { } else if (props.item.bargain_status === 3) {
Buttons = <Link to={`/play/video?id=${props.item.v_course_id}`} className={classnames('bargain', 'button--study')}>去学习</Link> Buttons = <Link to={`/play/video?id=${props.item.v_course_id}`} className={classnames('bargain', 'button--study')}>去学习</Link>
} else { } else {
...@@ -571,7 +571,7 @@ function CourseBottom(props) { ...@@ -571,7 +571,7 @@ function CourseBottom(props) {
} }
{ {
props.item.bargain_status === 0 && props.item.bargain_status === 0 &&
<a href="javascript:;" onClick={() => props.toDetail(props.item.course_id)} className={'bargain-btn'}>我要砍价</a> <a onClick={() => props.toDetail(props.item.course_id)} className={'bargain-btn'}>我要砍价</a>
} }
...@@ -627,7 +627,7 @@ function BargainSecond(props) { ...@@ -627,7 +627,7 @@ function BargainSecond(props) {
<div className='bargain-second'> <div className='bargain-second'>
<img className='top-img' src={require('./image/kanjia_cg_icon.png')} alt=""/> <img className='top-img' src={require('./image/kanjia_cg_icon.png')} alt=""/>
<p className='status-title'>厉害了,又帮好友砍掉<span className='ff4'>{props.money}</span>!</p> <p className='status-title'>厉害了,又帮好友砍掉<span className='ff4'>{props.money}</span>!</p>
<a className='bargain-href' href='#bargainCourse' onClick={props.close}>我也要砍价</a> <Link className='bargain-href' to='#bargainCourse' onClick={props.close}>我也要砍价</Link>
</div> </div>
) )
} }
...@@ -638,7 +638,7 @@ function NotBargain(props) { ...@@ -638,7 +638,7 @@ function NotBargain(props) {
<img className='middle-img' src={require('./image/kanjia_no_iccon.png')} alt=""/> <img className='middle-img' src={require('./image/kanjia_no_iccon.png')} alt=""/>
<p className='status-title'>你的好友用【砍价神器】把我砍蒙圈了<br/>不能再砍了哦~</p> <p className='status-title'>你的好友用【砍价神器】把我砍蒙圈了<br/>不能再砍了哦~</p>
<p className='status-dec'>邀请{props.limitPeople}位以上好友帮忙砍价可获得【砍价神器】</p> <p className='status-dec'>邀请{props.limitPeople}位以上好友帮忙砍价可获得【砍价神器】</p>
<a className='bargain-href' href='#bargainCourse' onClick={props.close}>我也要砍价</a> <Link className='bargain-href' to='#bargainCourse' onClick={props.close}>我也要砍价</Link>
</div> </div>
) )
} }
......
...@@ -7,7 +7,6 @@ import {Toast} from 'antd-mobile' ...@@ -7,7 +7,6 @@ import {Toast} from 'antd-mobile'
import {HeaderBar} from "@/common" import {HeaderBar} from "@/common"
import Loading from '@/common/Loading' import Loading from '@/common/Loading'
import {connect} from 'react-redux'; import {connect} from 'react-redux';
import {getCourses} from './../detail/actions';
@connect() @connect()
class Classify extends Component { class Classify extends Component {
...@@ -54,10 +53,8 @@ class Classify extends Component { ...@@ -54,10 +53,8 @@ class Classify extends Component {
toCourseDetail = (id) => { toCourseDetail = (id) => {
const { dispatch, history } = this.props; const { dispatch, history } = this.props;
// dispatch(getCourses(id, () => {
history.push(`/detail?id=${id}`); history.push(`/detail?id=${id}`);
return false; return false;
// }));
} }
render() { render() {
...@@ -72,10 +69,8 @@ class Classify extends Component { ...@@ -72,10 +69,8 @@ class Classify extends Component {
<div className="vip"> <div className="vip">
{this.state.special.list && this.state.special.list.length > 0 && this.state.special.list.map((item, index) => { {this.state.special.list && this.state.special.list.length > 0 && this.state.special.list.map((item, index) => {
return ( return (
<a href="javascript:;" onClick={() => this.toCourseDetail(item.course_id)} key={index}> <a onClick={() => this.toCourseDetail(item.course_id)} key={index}>
{/* <Link key={index} to={`/detail?id=${item.course_id}`}> */}
<img src={item.course_img} alt=""/> <img src={item.course_img} alt=""/>
{/* </Link> */}
</a> </a>
) )
}) })
...@@ -94,14 +89,12 @@ function ClassCourseA({data, toDetail}) { ...@@ -94,14 +89,12 @@ function ClassCourseA({data, toDetail}) {
{ {
data && data.length > 0 && data.map((item, index) => { data && data.length > 0 && data.map((item, index) => {
return ( return (
<a href="javascript:;" onClick={() => toDetail(item.course_id)} key={index} className='item-banner'> <a onClick={() => toDetail(item.course_id)} key={index} className='item-banner'>
{/* <Link to={`/detail?id=${item.course_id}`} key={index} className='item-banner'> */}
<img src={item.course_img} alt=""/> <img src={item.course_img} alt=""/>
{ {
(item.is_aist && (item.is_aist &&
<span className='return_cash'></span>) <span className='return_cash'></span>)
} }
{/* </Link> */}
</a> </a>
) )
}) })
......
...@@ -218,7 +218,7 @@ class Detail extends Component { ...@@ -218,7 +218,7 @@ class Detail extends Component {
nowPrice: res.data.data.data.now_price, nowPrice: res.data.data.data.now_price,
laterPrice: res.data.data.data.three_day_later_price, laterPrice: res.data.data.data.three_day_later_price,
singleType: 2, singleType: 2,
}) })
} else { } else {
Toast.info(res.data.data.msg, 2) Toast.info(res.data.data.msg, 2)
...@@ -274,7 +274,7 @@ class Detail extends Component { ...@@ -274,7 +274,7 @@ class Detail extends Component {
} }
} }
} }
}); });
} }
...@@ -415,7 +415,7 @@ class Detail extends Component { ...@@ -415,7 +415,7 @@ class Detail extends Component {
// 自组件传给父组件的boxHide // 自组件传给父组件的boxHide
boxHide = (val) => { boxHide = (val) => {
this.setState({ this.setState({
auditionBox: val, auditionBox: val,
singleBox: val, singleBox: val,
singleType: 1 singleType: 1
}) })
...@@ -442,14 +442,14 @@ class Detail extends Component { ...@@ -442,14 +442,14 @@ class Detail extends Component {
if(state.oid) { if(state.oid) {
href='/classify' href='/classify'
} }
return ( return (
<div> <div>
<div className='detail-box'> <div className='detail-box'>
<HeaderBar <HeaderBar
title='课程详情' title='课程详情'
arrow={true} arrow={true}
cart={true} cart={true}
toHref={href} toHref={href}
/> />
<CallApp className='toapp' /> <CallApp className='toapp' />
...@@ -471,7 +471,7 @@ class Detail extends Component { ...@@ -471,7 +471,7 @@ class Detail extends Component {
<p className='contact text-overflow-2'>{course_info.simpledescription}</p> <p className='contact text-overflow-2'>{course_info.simpledescription}</p>
<div className='des'> <div className='des'>
{ {
course_info.is_baoming === 0 && course_info.is_baoming === 0 &&
<p className="course-price"> <p className="course-price">
<span className="new">¥{course_info.price1}</span> <span className="new">¥{course_info.price1}</span>
<span className="old">¥{course_info.price0}</span> <span className="old">¥{course_info.price0}</span>
...@@ -521,11 +521,11 @@ class Detail extends Component { ...@@ -521,11 +521,11 @@ class Detail extends Component {
{/*单集购买弹窗*/} {/*单集购买弹窗*/}
{ {
singleBox && singleBox &&
<Single <Single
singleType={this.state.singleType} singleType={this.state.singleType}
singleBox={this.state.singleBox} singleBox={this.state.singleBox}
boxHide={this.boxHide} boxHide={this.boxHide}
data={this.state.singMess} data={this.state.singMess}
vcourseId={course_info.v_course_id} vcourseId={course_info.v_course_id}
videoId={this.state.singMess.video_id} videoId={this.state.singMess.video_id}
...@@ -536,10 +536,10 @@ class Detail extends Component { ...@@ -536,10 +536,10 @@ class Detail extends Component {
{/* 单集购买成功弹窗 */} {/* 单集购买成功弹窗 */}
{ {
singleType !== 1 && singleType !== 1 &&
<SingleSuccess <SingleSuccess
boxHide={this.boxHide} boxHide={this.boxHide}
data={this.state.singMess} data={this.state.singMess}
singleType={singleType} singleType={singleType}
vcourseId={course_info.v_course_id} vcourseId={course_info.v_course_id}
videoId={this.state.singMess.video_id} videoId={this.state.singMess.video_id}
nowPrice={this.state.nowPrice} nowPrice={this.state.nowPrice}
...@@ -565,7 +565,7 @@ class Detail extends Component { ...@@ -565,7 +565,7 @@ class Detail extends Component {
!course_info.is_aist && (course_info.group_status === 3 || course_info.group_status === 4) && !course_info.is_aist && (course_info.group_status === 3 || course_info.group_status === 4) &&
<Group <Group
courseInfo={course_info} courseInfo={course_info}
history={this.props.history} history={this.props.history}
countdown={countdown} countdown={countdown}
invitedFriends={this.invitedFriends} invitedFriends={this.invitedFriends}
/> />
...@@ -578,16 +578,16 @@ class Detail extends Component { ...@@ -578,16 +578,16 @@ class Detail extends Component {
} }
{/*课程介绍、大纲*/} {/*课程介绍、大纲*/}
<OutLine <OutLine
data={course_info} data={course_info}
toAudition={this.toAudition} toAudition={this.toAudition}
toSingleset={this.toSingleset} toSingleset={this.toSingleset}
/> />
{/*课程按钮*/} {/*课程按钮*/}
{ {
course_info && course_info &&
<BtnStatus <BtnStatus
countdown={countdown} countdown={countdown}
data={course_info} data={course_info}
user={this.props.user} user={this.props.user}
...@@ -599,7 +599,7 @@ class Detail extends Component { ...@@ -599,7 +599,7 @@ class Detail extends Component {
{ {
share ? ( share ? (
<div <div
className='groupSuccessMbc' className='groupSuccessMbc'
onClick={() => { onClick={() => {
this.setState({share: false}) this.setState({share: false})
...@@ -642,6 +642,6 @@ const mapDispatchToProps = (dispatch) => { ...@@ -642,6 +642,6 @@ const mapDispatchToProps = (dispatch) => {
dispatch dispatch
) )
} }
export default connect(mapStateToProps, mapDispatchToProps)(Detail) export default connect(mapStateToProps, mapDispatchToProps)(Detail)
\ No newline at end of file
...@@ -76,7 +76,7 @@ class My extends PureComponent { ...@@ -76,7 +76,7 @@ class My extends PureComponent {
</Link> </Link>
{ {
!isVIP && !isVIP &&
<a href="javascript:;" className="my-isvip" onClick={() => this.toCourseDetail(139)}></a> <a className="my-isvip" onClick={() => this.toCourseDetail(139)}></a>
} }
</List> </List>
} }
......
...@@ -41,16 +41,16 @@ function ProgressShareModal(props) { ...@@ -41,16 +41,16 @@ function ProgressShareModal(props) {
<div className="title">分享到</div> <div className="title">分享到</div>
<ul> <ul>
<li className='share-icon'> <li className='share-icon'>
<a style={{display: 'block'}} href={props.data.url}> <Link style={{display: 'block'}} to={props.data.url}>
<div className="icon"><i className='iconfont iconweixinzhifu'/></div> <div className="icon"><i className='iconfont iconweixinzhifu'/></div>
<div className='text'>微信好友</div> <div className='text'>微信好友</div>
</a> </Link>
</li> </li>
<li className='share-icon'> <li className='share-icon'>
<a style={{display: 'block'}} href={props.data.url}> <Link style={{display: 'block'}} to={props.data.url}>
<div className="icon"><i className='iconfont iconpengyouquaniconx'/></div> <div className="icon"><i className='iconfont iconpengyouquaniconx'/></div>
<div className='text'>朋友圈</div> <div className='text'>朋友圈</div>
</a> </Link>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -557,7 +557,7 @@ class Video extends Component { ...@@ -557,7 +557,7 @@ class Video extends Component {
this.setState( this.setState(
{ {
activeIndex: index activeIndex: index
}, },
() => { () => {
if (this.lessonAvailable(index)) { if (this.lessonAvailable(index)) {
if (this.hasAuth(index)) { if (this.hasAuth(index)) {
...@@ -673,14 +673,14 @@ class Video extends Component { ...@@ -673,14 +673,14 @@ class Video extends Component {
<div className="purchase-box"> <div className="purchase-box">
<div className='hint'>您尚未购买该课时,请购买后学习。</div> <div className='hint'>您尚未购买该课时,请购买后学习。</div>
<div className='btns'> <div className='btns'>
<button <button
type='button' type='button'
onClick={this.tobuy} onClick={this.tobuy}
className='purchase-class' className='purchase-class'
> >
¥{salePrice} 购买课程 ¥{salePrice} 购买课程
</button> </button>
<button <button
type='button' type='button'
onClick={this.toSingleset.bind(this, videoList[activeIndex])} onClick={this.toSingleset.bind(this, videoList[activeIndex])}
className='purchase-episode' className='purchase-episode'
...@@ -719,10 +719,10 @@ class Video extends Component { ...@@ -719,10 +719,10 @@ class Video extends Component {
{/*单集购买*/} {/*单集购买*/}
{ {
singleBox && singleBox &&
<Single <Single
courseId={course.course_id} courseId={course.course_id}
singleBox={this.state.singleBox} singleBox={this.state.singleBox}
boxHide={this.boxHide} boxHide={this.boxHide}
data={this.state.singMess} data={this.state.singMess}
singleType={this.state.singleType} singleType={this.state.singleType}
vcourseId={course.v_course_id} vcourseId={course.v_course_id}
...@@ -751,8 +751,8 @@ class Video extends Component { ...@@ -751,8 +751,8 @@ class Video extends Component {
pathname: '/play/video', pathname: '/play/video',
search: location.search search: location.search
}}/> }}/>
<Route <Route
path={`${match.path}/video`} path={`${match.path}/video`}
render={props => { render={props => {
return ( return (
<VideoCatalog <VideoCatalog
......
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