Commit 94a6b3a7 by xuzhenghua

bug

parents c1cd3d48 28f2cab5
...@@ -22,7 +22,7 @@ export default class index extends Component { ...@@ -22,7 +22,7 @@ export default class index extends Component {
render() { render() {
return ( return (
<div className='popup__container' onClick={this.closePopup}> <div className='popup__container' onClick={this.closePopup}>
<div className='content__container' style={this.computedStyle()}> <div className='content__container' style={this.computedStyle()} onClick={(e) => {e.stopPropagation()}}>
<img className="close__btn" onClick={this.props.closePopup} src='https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/close-btn.png' alt="" /> <img className="close__btn" onClick={this.props.closePopup} src='https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/close-btn.png' alt="" />
{ {
React.Children.map(this.props.children, function (child) { React.Children.map(this.props.children, function (child) {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
padding-left: 2px; padding-left: 2px;
display: flex; display: flex;
align-items: center; align-items: center;
transition: height .3s ease-in-out; transition: height .1s ease-out;
.sys-bullet-screen-swiper-container{ .sys-bullet-screen-swiper-container{
height: 100%; height: 100%;
......
...@@ -81,19 +81,23 @@ ...@@ -81,19 +81,23 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
color: #070F08; color: #070f08;
background:linear-gradient(90deg,rgba(255,227,0,1) 0%,rgba(255,202,0,1) 100%); background: linear-gradient(
90deg,
rgba(255, 227, 0, 1) 0%,
rgba(255, 202, 0, 1) 100%
);
} }
.subscribed { .subscribed {
background:rgba(254,228,29,1); background: rgba(254, 228, 29, 1);
} }
.living { .living {
background:rgba(0,153,255,1); background: rgba(0, 153, 255, 1);
color: #FFF; color: #fff;
} }
.check__video { .check__video {
background:rgba(114,220,141,1); background: rgba(114, 220, 141, 1);
color: #FFF; color: #fff;
} }
} }
} }
...@@ -105,7 +109,7 @@ ...@@ -105,7 +109,7 @@
align-items: center; align-items: center;
.sub__title { .sub__title {
color: #525C65; color: #525c65;
font-size: 16px; font-size: 16px;
line-height: 16px; line-height: 16px;
font-weight: 500; font-weight: 500;
...@@ -115,15 +119,14 @@ ...@@ -115,15 +119,14 @@
} }
.save-image { .save-image {
width: 133px;
height: 30px;
margin-top: 16px; margin-top: 16px;
background: rgba(83, 39, 250, 1); width: 270px;
border-radius: 15px; height: 44px;
font-size: 14px; background: rgba(255, 227, 25, 1);
color: #fff; border: 1px solid rgba(9, 9, 9, 1);
-webkit-appearance: none; border-radius: 5px;
outline: 0; font-size: 16px;
border: none; font-weight: normal;
} color: rgba(9, 9, 9, 1);
}
} }
...@@ -8,7 +8,8 @@ import UserBulletScreen from "@components/activity/newyear-2019/common/user-bull ...@@ -8,7 +8,8 @@ import UserBulletScreen from "@components/activity/newyear-2019/common/user-bull
class TreasureBox extends Component { class TreasureBox extends Component {
render() { render() {
return ( return (
<CommonContainer id="year-treasure"> <CommonContainer id="year-treasure" title={'组队开宝箱'}>
<div style={{textAlign: 'center', fontSize: '12px', color: '#FFDC1E', marginTop: '10px'}}>邀请好友组队一起开宝箱,满5人后将随机获得以下奖品~</div>
<Prizes showSystemNotices={true}/> <Prizes showSystemNotices={true}/>
<UserBulletScreen/> <UserBulletScreen/>
<TeamInfo /> <TeamInfo />
......
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