Commit f65cf663 by FE

Merge branch 'new-share'

parents 6b2dd2df 85afdf9b
...@@ -542,7 +542,9 @@ class Detail extends Component { ...@@ -542,7 +542,9 @@ class Detail extends Component {
title={course_info.course_title} title={course_info.course_title}
check={this.check} check={this.check}
courseId={course_info.course_id} courseId={course_info.course_id}
/>} />
}
{/* 单集购买成功弹窗 */} {/* 单集购买成功弹窗 */}
{ {
singleType !== 1 && singleType !== 1 &&
...@@ -561,17 +563,29 @@ class Detail extends Component { ...@@ -561,17 +563,29 @@ class Detail extends Component {
{/*payCallback={this.payCallback}*/} {/*payCallback={this.payCallback}*/}
{/*weixinPay = {this.weixinPay}*/} {/*weixinPay = {this.weixinPay}*/}
{/* 红包 */}
{
isRedPacket &&
<RedPacket
history={this.props.history}
country={this.props.country}
delCountryNum={this.props.delCountryNum}
/>
}
{/*分享赚钱*/} {/*分享赚钱*/}
{ {
course_info.is_dist && course_info.is_dist &&
<ShareRank courseInfo={course_info}/> <ShareRank courseInfo={course_info}/>
} }
{/** {
/**
* 拼团 * 拼团
* is_aist: 是否AI特训营 * is_aist: 是否AI特训营
* group_status: 团状态,3:课程有小团 用户没参加小团;4:用户参加了小团 * group_status: 团状态,3:课程有小团 用户没参加小团;4:用户参加了小团
*/} */
}
{ {
!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
...@@ -581,17 +595,6 @@ class Detail extends Component { ...@@ -581,17 +595,6 @@ class Detail extends Component {
invitedFriends={this.invitedFriends} invitedFriends={this.invitedFriends}
/> />
} }
{/* 红包 */}
{
isRedPacket &&
<RedPacket
history={this.props.history}
country={this.props.country}
delCountryNum={this.props.delCountryNum}
/>
}
{/*砍价*/} {/*砍价*/}
{ {
...@@ -617,7 +620,8 @@ class Detail extends Component { ...@@ -617,7 +620,8 @@ class Detail extends Component {
// addCourseToCart={this.props.addCourseToCart} // addCourseToCart={this.props.addCourseToCart}
toCart={this.toCart} toCart={this.toCart}
history={this.props.history} history={this.props.history}
/>} />
}
{ {
share ? ( share ? (
......
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