Commit 38160f5e by xuzhenghua

bug

parent 14d0c52f
...@@ -184,6 +184,7 @@ class Bargain extends Component { ...@@ -184,6 +184,7 @@ class Bargain extends Component {
render() { render() {
const { list, outList, barInfo } = this.state; const { list, outList, barInfo } = this.state;
console.log(barInfo)
const {user} = this.props const {user} = this.props
const uid = user && user.data && user.data.uid const uid = user && user.data && user.data.uid
return ( return (
...@@ -192,7 +193,7 @@ class Bargain extends Component { ...@@ -192,7 +193,7 @@ class Bargain extends Component {
{/*bargain_status 砍价状态 0-砍价中,1砍价结束,待支付,2砍价过期(没有砍价记录没有砍价信息),3已购买*/} {/*bargain_status 砍价状态 0-砍价中,1砍价结束,待支付,2砍价过期(没有砍价记录没有砍价信息),3已购买*/}
{ {
(barInfo.bargain_status === 2 || !uid) && (barInfo.bargain_status === 2 || !uid) &&
<BargainIntro limitPeople={barInfo.limitPeople} iWantBargain={this.iWantBargain}/> <BargainIntro limitPeople={barInfo.limit_people} iWantBargain={this.iWantBargain}/>
} }
{ {
(barInfo.bargain_status === 0 || barInfo.bargain_status === 1) && (barInfo.bargain_status === 0 || barInfo.bargain_status === 1) &&
......
...@@ -261,7 +261,7 @@ function GorupContent(props) { ...@@ -261,7 +261,7 @@ function GorupContent(props) {
if (is_success === 1) { if (is_success === 1) {
tip = <p className='success'>拼团成功</p> tip = <p className='success'>拼团成功</p>
btn = <Link to={`/play`} className='tostudy'>去学习</Link> btn = <Link to={`/detail?id=${data.course_id}`} className='tostudy'>去学习</Link>
} }
return ( return (
<div className='gorup-content'> <div className='gorup-content'>
......
...@@ -112,7 +112,7 @@ class MyOrders extends Component { ...@@ -112,7 +112,7 @@ class MyOrders extends Component {
<p className='order-content text-overflow-2'>{item.description}</p> <p className='order-content text-overflow-2'>{item.description}</p>
<p className='order-des'> <p className='order-des'>
<span <span
className='order-newprice'>¥{item.pay_amount}</span> className='order-newprice'>¥{item.amount}</span>
<span <span
className='order-price'>¥{item.price0}</span> className='order-price'>¥{item.price0}</span>
</p> </p>
......
...@@ -3,6 +3,13 @@ ...@@ -3,6 +3,13 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
.course-base-item{
margin-top: 0;
margin-bottom: 15px;
img{
border-radius: 3px;
}
}
.top { .top {
position: absolute; position: absolute;
......
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