Merge branch '00'

src/components/activity/newyear-2019/common/prizes/prizes.scss

@@ -116,7 +116,7 @@
             }
         }
 
-        & li:last-child{
+        & li:last-child {
             display: flex;
             align-items: center;
             justify-content: center;
@@ -173,6 +173,7 @@
                 height: 2px;
                 background: #fff;
                 border-radius: 1px;
+
                 .progress {
                     position: absolute;
                     right: 0;
@@ -194,3 +195,29 @@
         }
     }
 }
+
+
+.landing-treasure-rules {
+    width: 320px;
+
+    &.popup-container {
+        top: 50%;
+        transform: translate(-50%, -50%);
+        .title {
+            font-size: 18px;
+            color: #111111;
+        }
+    }
+
+    .content {
+        padding: 0 19px 15px;
+        margin-top: 22px;
+        color: #666666;
+        font-size: 14px;
+
+        li {
+            margin-bottom: 5px;
+        }
+    }
+}
+

src/components/activity/newyear-2019/preheat/LiveRoom/index.js

@@ -25,6 +25,13 @@ class LiveRoom extends Component {
   componentDidMount() {
     this.getLiveInfo();
   }
+  shouldComponentUpdate(nextProps, nextState, nextContext) {
+    if (this.props.isAppUpdate !== nextProps.isAppUpdate) {
+        this.getLiveInfo();
+        return false
+    }
+    return true
+  }
   getLiveInfo = () => {
     http.get(`${API.home}/activity/get_live_info`).then(res => {
       const { code, data, msg } = res.data;

src/components/activity/newyear-2019/preheat/index.js

@@ -133,11 +133,11 @@ export default class index extends Component {
                 </div>
 
                 {/* 大咖直播 */}
-                <LiveRoom/>
+                <LiveRoom isAppUpdate={this.state.isAppUpdate}/>
 
                 {/* 组队开宝箱 */}
                 {
-                    treasure_stage === 1 && <TreasureBox getRemovable={this.getRemovable}/>
+                    treasure_stage === 1 && <TreasureBox isAppUpdate={this.state.isAppUpdate} getRemovable={this.getRemovable}/>
                 }
 
                 {/*课程*/}

src/components/activity/newyear-2019/treasure-box/index.js

@@ -16,7 +16,7 @@ class TreasureBox extends Component {
         <div style={{textAlign: 'center', fontSize: '12px', color: '#FFDC1E', marginTop: '10px'}}>邀请好友组队一起开宝箱，满5人后将随机获得以下奖品~</div>
         <Prizes showSystemNotices={true}/>
         <UserBulletScreen/>
-        <TeamInfo getRemovable={this.props.getRemovable} />
+        <TeamInfo isAppUpdate={this.state.isAppUpdate} getRemovable={this.props.getRemovable} />
         <TreasureRank history={this.props.history} />
       </CommonContainer>
     )

src/components/activity/newyear-2019/treasure-box/team.js

@@ -83,6 +83,14 @@ class TeamInfo extends Component {
     }
   }
 
+  shouldComponentUpdate(nextProps, nextState, nextContext) {
+    if (this.props.isAppUpdate !== nextProps.isAppUpdate) {
+      this.getTeamInfo();
+      return false
+    }
+    return true
+  }
+
   // 邀请好友组队
   createTeam = () => {
     if(this.props.user.hasError) {