Skip to content

M
mr-julyedu
Commit 3ac26ffd by xuzhenghua
Options

拼团

parent 015bdece
Showing with 46 additions and 39 deletions
src/components/blessingPreheat/collectBlessing/index.js
...@@ -51,7 +51,7 @@ class CollectBlessing extends Component { ...@@ -51,7 +51,7 @@ class CollectBlessing extends Component {
] ]
} }
], ],
seconds: 10, seconds: 5,
}; };
} }
...@@ -118,7 +118,7 @@ class CollectBlessing extends Component { ...@@ -118,7 +118,7 @@ class CollectBlessing extends Component {
}); });
} }
} }
fetchUserBlessing(key, cb) { fetchUserBlessing(key, cb) {
const { handleToShowShare, handleToHideShare } = this.props; const { handleToShowShare, handleToHideShare } = this.props;
let { seconds } = this.state; let { seconds } = this.state;
...@@ -131,9 +131,9 @@ class CollectBlessing extends Component { ...@@ -131,9 +131,9 @@ class CollectBlessing extends Component {
handleToShowShare(); handleToShowShare();
this.shareTimer = setInterval(() => { this.shareTimer = setInterval(() => {
this.setState( this.setState(
{ {
seconds: (--seconds) seconds: (--seconds)
}, },
() => { () => {
if (seconds === 0) { if (seconds === 0) {
typeof cb === 'function' && cb(); typeof cb === 'function' && cb();
...@@ -159,13 +159,13 @@ class CollectBlessing extends Component { ...@@ -159,13 +159,13 @@ class CollectBlessing extends Component {
} }
}); });
} }
render() { render() {
const { const {
isSign, isSign,
userInfo: { isLogin = false, blessingVal = 0, buyBlessing = 0, inviteBlessing = 0 }, userInfo: { isLogin = false, blessingVal = 0, buyBlessing = 0, inviteBlessing = 0 },
handleToShowNotice, handleToShowNotice,
handleToShowList, handleToShowList,
handleToShowInvite, handleToShowInvite,
handleToShow, handleToShow,
toLogin, toLogin,
...@@ -175,13 +175,13 @@ class CollectBlessing extends Component { ...@@ -175,13 +175,13 @@ class CollectBlessing extends Component {
return ( return (
<div className="collect-blessing"> <div className="collect-blessing">
{ {
isLogin isLogin
? ( ? (
<ListHeader text={`我的福气值： ${blessingVal}分`} size="middle" styles={{margin: '20px 0 0 0'}} /> <ListHeader text={`我的福气值： ${blessingVal}分`} size="middle" styles={{margin: '20px 0 0 0'}} />
) )
: ( : (
<ListHeader size="middle" styles={{margin: '20px 0 0 0'}} > <ListHeader size="middle" styles={{margin: '20px 0 0 0'}} >
<span className="text_nologin">我的福气值：</span> <span className="text_nologin">我的福气值：</span>
<span onClick={toLogin} className="login__btn">登录</span> <span onClick={toLogin} className="login__btn">登录</span>
</ListHeader> </ListHeader>
) )
...@@ -202,7 +202,7 @@ class CollectBlessing extends Component { ...@@ -202,7 +202,7 @@ class CollectBlessing extends Component {
item.rules.map(item => { item.rules.map(item => {
return ( return (
<p key={item.id}> <p key={item.id}>
{item.text} {item.text}
<span>{item.des}</span> <span>{item.des}</span>
</p> </p>
) )
...@@ -241,18 +241,18 @@ class CollectBlessing extends Component { ...@@ -241,18 +241,18 @@ class CollectBlessing extends Component {
<div className="collect-blessing__content" data-layout="column"> <div className="collect-blessing__content" data-layout="column">
<p className="collect-blessing__label">去分享</p> <p className="collect-blessing__label">去分享</p>
<div className="collect-blessing__share"> <div className="collect-blessing__share">
<a <a
className="collect-blessing__share-button" className="collect-blessing__share-button"
data-type="qq" data-type="qq"
onClick={this.qqToShare} onClick={this.qqToShare}
></a> ></a>
<a <a
className="collect-blessing__share-button" className="collect-blessing__share-button"
data-type="wechat" data-type="wechat"
onClick={this.wechatToShare} onClick={this.wechatToShare}
></a> ></a>
<a <a
className="collect-blessing__share-button" className="collect-blessing__share-button"
data-type="weibo" data-type="weibo"
onClick={this.weiboToShare} onClick={this.weiboToShare}
></a> ></a>
...@@ -274,8 +274,8 @@ class CollectBlessing extends Component { ...@@ -274,8 +274,8 @@ class CollectBlessing extends Component {
} }
{ {
index === 5 && index === 5 &&
<a <a
className="collect-blessing__content" className="collect-blessing__content"
onClick={toSection}> onClick={toSection}>
<span>去选课</span> <span>去选课</span>
<i>已加{buyBlessing}点</i> <i>已加{buyBlessing}点</i>
......
src/components/detail/group/togroup.js
...@@ -63,16 +63,19 @@ class ToGroup extends Component { ...@@ -63,16 +63,19 @@ class ToGroup extends Component {
if (res.data.data.is_success === 0) { if (res.data.data.is_success === 0) {
let date = res.data.data.end_time * 1000, let date = res.data.data.end_time * 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); day = `${parseInt(date / (3600000 * 24))}`.padStart(2, 0);
minutes = `${parseInt((date - hours * 3600000) / 60000)}`.padStart(2, 0); hours = `${parseInt((date- day * 3600000 * 24)/3600000)}`.padStart(2, 0);
seconds = `${parseInt((date - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0); minutes = `${parseInt((date - day * 3600000 * 24 - hours * 3600000) / 60000)}`.padStart(2, 0);
seconds = `${parseInt((date - day * 3600000 * 24 - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0);
this.setState({ this.setState({
countdown: `${hours}:${minutes}:${seconds}` // countdown: `${day}:${hours}:${minutes}:${seconds}`
countdown: `${day}:${hours}:${minutes}`
}); });
}, 1000) }, 1000)
} }
......
src/components/detail/index.js
...@@ -79,7 +79,7 @@ class Detail extends Component { ...@@ -79,7 +79,7 @@ class Detail extends Component {
if(getParam('ac') && Number(getParam('ac')) === 11) { if(getParam('ac') && Number(getParam('ac')) === 11) {
this.getBorwerCourse(); this.getBorwerCourse();
} }
} }
getBorwerCourse = () => { getBorwerCourse = () => {
...@@ -345,16 +345,19 @@ class Detail extends Component { ...@@ -345,16 +345,19 @@ class Detail extends Component {
if (course_info.group_status === 3 || course_info.group_status === 4) { if (course_info.group_status === 3 || course_info.group_status === 4) {
let endTime = course_info.pdd_group_info.groupon_member.end_time; let endTime = course_info.pdd_group_info.groupon_member.end_time;
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); day = `${parseInt(date / (3600000 * 24))}`.padStart(2, 0);
minutes = `${parseInt((date - hours * 3600000) / 60000)}`.padStart(2, 0); hours = `${parseInt((date- day * 3600000 * 24)/3600000)}`.padStart(2, 0);
seconds = `${parseInt((date - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0); minutes = `${parseInt((date - day * 3600000 * 24 - hours * 3600000) / 60000)}`.padStart(2, 0);
seconds = `${parseInt((date - day * 3600000 * 24 - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0);
this.setState({ this.setState({
countdown: `${hours}:${minutes}:${seconds}` // countdown: `${day}:${hours}:${minutes}:${seconds}`
countdown: `${day}:${hours}:${minutes}`
}); });
}, 1000) }, 1000)
} }
...@@ -700,15 +703,16 @@ class Detail extends Component { ...@@ -700,15 +703,16 @@ class Detail extends Component {
* 拼团价格为1分钱时，不允许参团 * 拼团价格为1分钱时，不允许参团
*/ */
} }
{ {/*双十一期间不需要显示*/}
isCent && !course_info.is_aist && (course_info.group_status === 3 || course_info.group_status === 4) && {/*{*/}
<Group {/*isCent && !course_info.is_aist && (course_info.group_status === 3 || course_info.group_status === 4) &&*/}
courseInfo={course_info} {/*<Group*/}
history={this.props.history} {/*courseInfo={course_info}*/}
countdown={countdown} {/*history={this.props.history}*/}
invitedFriends={this.invitedFriends} {/*countdown={countdown}*/}
/> {/*invitedFriends={this.invitedFriends}*/}
} {/*/>*/}
{/*}*/}
{/* {/*
* 砍价 * 砍价
......
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