Commit f4ccf1de by xuzhenghua

强制拼团

parent 8e67e54b
...@@ -40,7 +40,7 @@ class Group extends Component { ...@@ -40,7 +40,7 @@ class Group extends Component {
const {courseInfo, history} = this.props; const {courseInfo, history} = this.props;
if (courseInfo.group_status === 3) { if (courseInfo.group_status === 3) {
history.push( history.push(
`/order?id=${getParam('id')}`, `/order?id=${getParam('id')}`,
{ {
group: 1, group: 1,
pdd_order_id pdd_order_id
...@@ -119,9 +119,9 @@ class Group extends Component { ...@@ -119,9 +119,9 @@ class Group extends Component {
render() { render() {
const { courseInfo } = this.props; const { courseInfo } = this.props;
const { alreadyIn, countdown, now_groupon_list } = this.state; const { alreadyIn, countdown, now_groupon_list } = this.state;
let groupInfo = '', let groupInfo = '',
groupon_member = '', groupon_member = '',
group_status = -1, group_status = -1,
groupSuccessMbc = null; groupSuccessMbc = null;
if (courseInfo) { if (courseInfo) {
groupInfo = courseInfo.pdd_group_info; groupInfo = courseInfo.pdd_group_info;
...@@ -178,33 +178,38 @@ class Group extends Component { ...@@ -178,33 +178,38 @@ class Group extends Component {
return ( return (
<div className='group-box'> <div className='group-box'>
<div className="group-title"> {
<span>{groupInfo.now_groupon_total}人正在开团,可直接参与</span> courseInfo.is_force ==0 &&
<span className='more' onClick={this.getMore}> <>
<div className="group-title">
<span>{groupInfo.now_groupon_total}人正在开团,可直接参与</span>
<span className='more' onClick={this.getMore}>
查看更多 查看更多
<i className='iconfont iconiconfront-70'></i> <i className='iconfont iconiconfront-70'></i>
</span> </span>
</div>
<ul className="group-list">
{
groupInfo.now_groupon_list && groupInfo.now_groupon_list.length > 0 && groupInfo.now_groupon_list.map((item, index) => {
return (
<li key={index} className='group-item'>
<img className='avatar' src={item.avatar} alt="" />
<div className='user-name text-overflow-one'>
{item.user_name}
</div>
<div className='group-status'>
<p>还差<span className='red'>{item.number}</span>拼成</p>
<p>剩余 {this.formatTimeByMillisecond(item.end_time)}</p>
</div>
<span onClick={() => { this.toPay(item.pdd_order_id) }} className='topay'>去参团</span>
</li>
)
})
}
</ul>
</>
}
</div>
<ul className="group-list">
{
groupInfo.now_groupon_list && groupInfo.now_groupon_list.length > 0 && groupInfo.now_groupon_list.map((item, index) => {
return (
<li key={index} className='group-item'>
<img className='avatar' src={item.avatar} alt="" />
<div className='user-name text-overflow-one'>
{item.user_name}
</div>
<div className='group-status'>
<p>还差<span className='red'>{item.number}</span>拼成</p>
<p>剩余 {this.formatTimeByMillisecond(item.end_time)}</p>
</div>
<span onClick={() => { this.toPay(item.pdd_order_id) }} className='topay'>去参团</span>
</li>
)
})
}
</ul>
<div className="group-dec"> <div className="group-dec">
<span> <span>
<i className='iconfont iconiconfront-1'></i> <i className='iconfont iconiconfront-1'></i>
......
...@@ -86,7 +86,7 @@ class Detail extends Component { ...@@ -86,7 +86,7 @@ class Detail extends Component {
this.userStatus() this.userStatus()
} }
componentWillMount(){ componentWillMount() {
this.showUserGiftFun() this.showUserGiftFun()
} }
...@@ -129,7 +129,7 @@ class Detail extends Component { ...@@ -129,7 +129,7 @@ class Detail extends Component {
let now_time = (new Date()).valueOf() // 获取当前时间 let now_time = (new Date()).valueOf() // 获取当前时间
localStorage.setItem('newer_last_time', now_time) // 存储关闭时间 localStorage.setItem('newer_last_time', now_time) // 存储关闭时间
} }
get_newerModal = ()=>{ get_newerModal = () => {
this.close() this.close()
this.props.history.push('/passport/login') this.props.history.push('/passport/login')
} }
...@@ -413,17 +413,28 @@ class Detail extends Component { ...@@ -413,17 +413,28 @@ class Detail extends Component {
let endTime = course_info.pdd_group_info.groupon_member.end_time let endTime = course_info.pdd_group_info.groupon_member.end_time
if (endTime && endTime > 0) { if (endTime && endTime > 0) {
let date = endTime * 1000, let date = endTime * 1000,
day = 0,
hours = 0, hours = 0,
minutes = 0, minutes = 0,
seconds = 0 seconds = 0
setInterval(() => { setInterval(() => {
date -= 1000 date -= 1000
hours = `${parseInt(date / (60 * 60 * 1000))}`.padStart(2, 0) console.log(endTime)
minutes = `${parseInt((date - hours * 3600000) / 60000)}`.padStart(2, 0) if (endTime > 86400) {
seconds = `${parseInt((date - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0) day = `${parseInt(date / (3600000 * 24))}`.padStart(2, 0)
this.setState({ hours = `${parseInt((date - day * 3600000 * 24) / 3600000)}`.padStart(2, 0)
countdown: `${hours}:${minutes}:${seconds}` minutes = `${parseInt((date - day * 3600000 * 24 - hours * 3600000) / 60000)}`.padStart(2, 0)
}) this.setState({
countdown: `${day}:${hours}:${minutes}`
})
} else {
hours = `${parseInt(date / (60 * 60 * 1000))}`.padStart(2, 0)
minutes = `${parseInt((date - hours * 3600000) / 60000)}`.padStart(2, 0)
seconds = `${parseInt((date - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0)
this.setState({
countdown: `${hours}:${minutes}:${seconds}`
})
}
}, 1000) }, 1000)
} }
} }
......
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