Merge branch '00' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 00

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

@@ -116,6 +116,12 @@
             }
         }
 
+        & li:last-child {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
         .top-tag {
             position: absolute;
             top: 0;
@@ -167,6 +173,7 @@
                 height: 2px;
                 background: #fff;
                 border-radius: 1px;
+
                 .progress {
                     position: absolute;
                     right: 0;
@@ -188,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/common/system-bullet-screen/index.js

@@ -60,8 +60,12 @@ class SystemBulletScreen extends Component {
         content.style.transform = `translate3d(${-(contentWidth - wrapperWidth) - 10}px,0,0)`
       }, 1000)
     } else {
+      const {bullets} = this.props
+      const len = bullets.length * 3
       setTimeout(() => {
-        ++this.count;
+        if (++this.count === len) {
+          this.sysNotice.style.height = `0px`
+        }
         (swiper && !swiper.destroyed) && swiper.slideNext()
       }, 3000)
     }

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

@@ -17,8 +17,10 @@ class Landing extends Component {
   closeIcon = 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/close-btn.png'
   createTeamSuccessPopup = null
   joinSuccessPopup = null
+  shareTipPopup = null
   swiper = null
 
+
   state = {
     teamData: {
       member: []
@@ -42,8 +44,13 @@ class Landing extends Component {
     }
   }
 
+  componentWillUnmount() {
+    this.shareTipPopup && this.shareTipPopup.remove()
+  }
+
 
   fetchPageData = ({origin = this.state.origin, treasure_code = this.state.treasure_code} = {}) => {
+    const {location} = this.props
     http.post(`${API.home}/sys/treasure/team`, {
       treasure_code,
       origin
@@ -58,6 +65,16 @@ class Landing extends Component {
             activityEnd: data.status == 5
           })
 
+          if (browser.isWeixin) {
+            wxShare({
+              title: `@${data.member[0].user_name} 邀您一起组队拿豪礼！`,
+              desc: `加入我的队伍，机械键盘，纸质书籍等超多奖品等你拿！`,
+              link: `${window.location.origin}${location.pathname}?treasure_code=${getParam('treasure_code')}&origin=2`,
+              imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/wx-share-icon.png'
+            })
+            // history.replace(`${match.url}?treasure_code=${getParam('treasure_code')}&origin=2`)
+          }
+
           let searchParams = new URLSearchParams(window.location.search)
           if (searchParams.get('origin') === '1' && !browser.isWeixin) {
             searchParams.set('origin', '2')
@@ -75,7 +92,7 @@ class Landing extends Component {
   }
 
   showSharePromptWithParam = () => {
-    if (sessionStorage.getItem('showShareTip')) {
+    if (sessionStorage.getItem('showShareTip') && !sessionStorage.getItem('closedRemind')) {
       this.showShareTip()
     }
   }
@@ -115,7 +132,8 @@ class Landing extends Component {
       })
   }
 
-  handleToMyTreasure = () => {
+  handleToMyTreasure = id => {
+    const {history} = this.props
     this.joinSuccessPopup && this.joinSuccessPopup.remove()
     if (getParam('version')) {
       history.push(`/year/yearTreasure?id=${id}&version=${getParam('version')}`)
@@ -125,7 +143,6 @@ class Landing extends Component {
   }
 
   joinSuccess = ({id, status, my_team: {team_num, lack_member, is_team, treasure_code}}) => {
-    const {history} = this.props
     this.joinSuccessPopup = Popup({
       title: <div className={'join-success'}>
         <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/check-icon.png" alt=""/>
@@ -145,9 +162,9 @@ class Landing extends Component {
         {
           status === 2
             ? <img style={{width: '150px', marginTop: '23px'}}
-                   src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/PC/treasure-box.png"
+                   src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/treasure-split.gif"
                    alt=""
-                   onClick={this.handleToMyTreasure}
+                   onClick={this.handleToMyTreasure.bind(this, id)}
             />
             : is_team
             ? <button type='button'
@@ -177,14 +194,6 @@ class Landing extends Component {
       }
       SendMessageToApp("toShare", data)
     }
-    if (browser.isWeixin) {
-      wxShare({
-        title: `@${user.data.username} 邀您一起组队拿豪礼！`,
-        desc: `加入我的队伍，机械键盘，纸质书籍等超多奖品等你拿！`,
-        link: `${window.location.origin}${location.pathname}?treasure_code=${treasure_code}&origin=2`,
-        imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/wx-share-icon.png'
-      })
-    }
     sessionStorage.setItem('showShareTip', '1')
     history.replace(`${match.url}?treasure_code=${treasure_code}&origin=${1}`)
     this.createTeamSuccessPopup && this.createTeamSuccessPopup.remove() && (this.createTeamSuccessPopup = null)
@@ -278,6 +287,7 @@ class Landing extends Component {
             </div>,
             close: () => {
               // history.replace(`${match.path}?treasure_code=${treasure_code}&origin=1`)
+              sessionStorage.setItem('closedRemind', '1')
               this.fetchPageData({
                 treasure_code,
                 origin
@@ -301,16 +311,7 @@ class Landing extends Component {
       })
 
     } else {
-      if (browser.isWeixin && getParam('origin') == 1) {
-        wxShare({
-          title: `@${user.data.username} 邀您一起组队拿豪礼！`,
-          desc: `加入我的队伍，机械键盘，纸质书籍等超多奖品等你拿！`,
-          link: `${window.location.origin}${location.pathname}?treasure_code=${getParam('treasure_code')}&origin=2`,
-          imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/wx-share-icon.png'
-        })
-        // history.replace(`${match.url}?treasure_code=${getParam('treasure_code')}&origin=2`)
-      }
-      Popup({
+      this.shareTipPopup = Popup({
         title: <div>还差<span>{this.state.teamData.lack_member}</span>名队友即可获得宝箱 快分享给好友吧~</div>,
         className: `landing-share-tip ${browser.isWeixin ? 'wechat' : ''}`,
         closable: false,
@@ -356,7 +357,11 @@ class Landing extends Component {
     const {history, user} = this.props
 
     if (user.hasError) {
-      history.push('/passport')
+      if (browser.isWeixin) {
+        window.location.assign(`https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=${encodeURIComponent(window.location.href + '&aa=bb')}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`)
+      } else {
+        history.push('/passport')
+      }
       return true
     }
   }

src/components/activity/newyear-2019/landing/landing.scss

 .sup {
     position: absolute;
     right: -10px;
-    top: -13px;
+    top: 0;
+    transform: translateY(-50%);
     width: 30px;
     height: 16px;
     background: rgba(255, 227, 0, 1);
@@ -108,6 +109,7 @@
                 width: 36px;
                 height: 36px;
                 border-radius: 50%;
+                border: 1px solid #fff;
             }
         }
 

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.props.isAppUpdate} getRemovable={this.props.getRemovable} />
         <TreasureRank history={this.props.history} />
       </CommonContainer>
     )

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

@@ -83,11 +83,20 @@ 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) {
       this.toLogin();
     } else {
+      sessionStorage.setItem('showShareTip', '1')
       const {is_my_team, my_team: {treasure_code}} = this.state;
       if(is_my_team) { // 有自己的队伍
         // 直接跳转