Commit d3ada8c5 by zhanghaozhe

活动结束

parent 34883f86
...@@ -276,7 +276,7 @@ class Landing extends Component { ...@@ -276,7 +276,7 @@ class Landing extends Component {
} }
remind = (type = 'create', trearemindsure_code, origin = 1) => { remind = (type = 'create', treasure_code, origin = 1) => {
const {user} = this.props const {user} = this.props
http.get(`${API["base-api"]}/wx/user_temporary_qrcode/${user.data.uid}`) http.get(`${API["base-api"]}/wx/user_temporary_qrcode/${user.data.uid}`)
.then(res => { .then(res => {
...@@ -414,15 +414,15 @@ class Landing extends Component { ...@@ -414,15 +414,15 @@ class Landing extends Component {
return ( return (
<div id={'landing'}> <div id={'landing'}>
{ {
!standby_plan && !(standby_plan && browser.isWeixin) &&
<div id="to-square"> <div id="to-square">
<a href='javascript:' onClick={this.toSquare}>前往活动会场,享更多福利! >></a> <a href='javascript:' onClick={this.toSquare}>前往活动会场,享更多福利! >></a>
</div> </div>
} }
<BoxContainer> <BoxContainer>
<i className="snow-deco"/> <i className={`snow-deco ${standby_plan ? 'standby' : ''}`}/>
{ {
standby_plan && standby_plan && browser.isWeixin &&
<> <>
<WhiteSpace className={'standby-space'}/> <WhiteSpace className={'standby-space'}/>
<div className={'standby-tip'}>点击右上角,选择“在浏览器打开”</div> <div className={'standby-tip'}>点击右上角,选择“在浏览器打开”</div>
...@@ -486,7 +486,7 @@ class Landing extends Component { ...@@ -486,7 +486,7 @@ class Landing extends Component {
还差 {lack_member} 名队员即可获得当前宝箱哦~ 还差 {lack_member} 名队员即可获得当前宝箱哦~
</div> </div>
{ {
!standby_plan && !(standby_plan && browser.isWeixin) &&
<button type='button' className={'invite-btn'} onClick={this.showShareTip}> <button type='button' className={'invite-btn'} onClick={this.showShareTip}>
邀请好友加入队伍 邀请好友加入队伍
</button> </button>
...@@ -505,7 +505,7 @@ class Landing extends Component { ...@@ -505,7 +505,7 @@ class Landing extends Component {
} }
</div> </div>
{ {
!standby_plan && (my_team['is_team'] ? !(standby_plan && browser.isWeixin) && (my_team['is_team'] ?
<button type='button' className={'invite-btn'} <button type='button' className={'invite-btn'}
onClick={this.inviteMembers.bind(this, my_team['treasure_code'])}> onClick={this.inviteMembers.bind(this, my_team['treasure_code'])}>
继续组队 继续组队
...@@ -528,7 +528,7 @@ class Landing extends Component { ...@@ -528,7 +528,7 @@ class Landing extends Component {
} }
</div> </div>
{ {
!standby_plan && (my_team['is_team'] ? !(standby_plan && browser.isWeixin) && (my_team['is_team'] ?
<button type='button' className={'invite-btn'} <button type='button' className={'invite-btn'}
onClick={this.inviteMembers.bind(this, my_team['treasure_code'])}> onClick={this.inviteMembers.bind(this, my_team['treasure_code'])}>
继续组队 继续组队
......
...@@ -43,6 +43,10 @@ ...@@ -43,6 +43,10 @@
height: 68px; height: 68px;
background: url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/snow-deco.png") no-repeat; background: url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/snow-deco.png") no-repeat;
background-size: contain; background-size: contain;
&.standby{
top: 0;
}
} }
.main-avatar { .main-avatar {
...@@ -70,7 +74,7 @@ ...@@ -70,7 +74,7 @@
} }
.standby-space{ .standby-space{
height: 55px; height: 25px;
} }
.standby-tip { .standby-tip {
...@@ -79,7 +83,7 @@ ...@@ -79,7 +83,7 @@
height: 32px; height: 32px;
background: #FFDE00; background: #FFDE00;
border-radius: 5px; border-radius: 5px;
margin: 0 auto; margin: 0 auto -20px;
line-height: 32px; line-height: 32px;
text-align: center; text-align: center;
color: #202426; color: #202426;
......
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