Merge branch '00'

# Conflicts:
#	build/mrstatic/js/newyear-yearIndex.67a3f02e.chunk.js
#	build/mrstatic/js/newyear-yearIndex.a5223d56.chunk.js
#	build/mrstatic/js/newyear-yearIndex.baf6e910.chunk.js
#	build/mrstatic/js/runtime~main.4f499422.js.map
#	build/mrstatic/js/runtime~main.d2059c82.js
#	build/mrstatic/js/runtime~main.d2059c82.js.map
#	build/mrstatic/js/runtime~main.ea29db39.js.map

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

@@ -19,6 +19,8 @@ class Landing extends Component {
   joinSuccessPopup = null
   shareTipPopup = null
   swiper = null
+  shareTitle = ''
+  shareDesc = ''
 
 
   state = {
@@ -65,10 +67,12 @@ class Landing extends Component {
             activityEnd: data.status == 5
           })
 
+          this.setupWxShareConfig(data.member)
+
           if (browser.isWeixin) {
             wxShare({
-              title: `@${data.member[0].user_name} 邀您一起组队拿豪礼！`,
-              desc: `加入我的队伍，机械键盘，纸质书籍等超多奖品等你拿！`,
+              title: this.shareTitle,
+              desc: this.shareDesc,
               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'
             })
@@ -91,6 +95,13 @@ class Landing extends Component {
       })
   }
 
+  setupWxShareConfig = member => {
+    const len = member.length
+    let count = 5 - len <= 0 ? 4 : 5 - len
+    this.shareTitle = `还差${count}人即可开宝箱，100%有奖！`
+    this.shareDesc = '加入我的队伍，机械键盘，纸质书籍等超多奖品等你拿！--七月在线'
+  }
+
   showSharePromptWithParam = () => {
     if (sessionStorage.getItem('showShareTip') && !sessionStorage.getItem('closedRemind')) {
       this.showShareTip()
@@ -187,8 +198,8 @@ class Landing extends Component {
     const {history, match, user, location} = this.props
     if (getParam('version')) {
       let data = {
-        title: `@${user.data.username} 邀您一起组队拿豪礼！`,
-        desc: `加入我的队伍，机械键盘，纸质书籍等超多奖品等你拿！`,
+        title: this.shareTitle,
+        desc: this.shareDesc,
         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'
       }
@@ -304,8 +315,8 @@ class Landing extends Component {
     if (browser.isAndroidApp || browser.isIOSApp) {
 
       SendMessageToApp('toShare', {
-        title: `@${user.data.username} 邀您一起组队拿豪礼！`,
-        desc: `加入我的队伍，机械键盘，纸质书籍等超多奖品等你拿！`,
+        title: this.shareTitle,
+        desc: this.shareDesc,
         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'
       })

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

@@ -43,6 +43,7 @@ class MyTreasure extends Component {
   componentDidMount() {
     this.fetchMyTreasure()
     this.fetchActivityStatus()
+    document.title = '七月在线年终大回馈，幸运宝箱随你开，100%有奖！人气好课免费学，精品课程1分抢！';
   }
 
   componentWillReceiveProps(nextProp) {
@@ -517,7 +518,7 @@ class MyTreasure extends Component {
             </Mask>
 
             {/*绑定手机号--弹窗 */}
-            <Mask visible={isPhone} handleToHide={() => this.handleToHideWindow('isPhone')}>
+            <Mask visible={isPhone} className="popup-bind-phone" handleToHide={() => this.handleToHideWindow('isPhone')}>
               <BindPhone
                 history={history}
                 country={country}
@@ -544,7 +545,7 @@ class MyTreasure extends Component {
             </Mask>
 
             {/* 绑定地址--弹窗 */}
-            <Mask visible={isAddress} handleToHide={() => this.handleToHideWindow('isAddress')}>
+            <Mask visible={isAddress} className="popup-bind-address" handleToHide={() => this.handleToHideWindow('isAddress')}>
               <AddressPopup
                 skip="year"
                 tip={

src/components/activity/newyear-2019/myTreasure/index.scss

@@ -86,6 +86,17 @@
   }
 }
 
+.mask-content {
+
+  &.popup-bind-phone {
+    height: 350px;
+  }
+  
+  &.popup-bind-address {
+    height: 316px;
+  }
+}
+
 // 所有弹窗
 .popup-container {
 

src/components/activity/newyear-2019/myTreasure/mask.js

 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
+import classnames from 'classnames';
 import './mask.scss';
 
 const Root = document.querySelector('body');
@@ -22,12 +23,12 @@ class Mask extends Component {
   }
 
   render() {
-    const { visible, handleToHide } = this.props;
+    const { visible, handleToHide, className } = this.props;
     if(visible) {
       return ReactDOM.createPortal(
         (
           <div className="mask">
-            <div className="mask-content">
+            <div className={classnames("mask-content", className)}>
               {this.props.children}
             </div>
             <div className="mask-footer">

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

@@ -39,6 +39,7 @@ export default class index extends Component {
             _this.loginInfo(result)
         }
         _this.getStage()
+        document.title = '七月在线年终大回馈，幸运宝箱随你开，100%有奖！人气好课免费学，精品课程1分抢！';
     }
 
     // 获取app登录数据

src/components/activity/newyear-2019/preheat/nav.scss

@@ -27,7 +27,7 @@
     line-height: 26px;
 
     &.active {
-      border-right: 1px solid #090F08;
+      border: 1px solid #090F08;
       border-radius: 3px;
       color: #090F08;
       background-color: #FEE41D;

src/components/activity/newyear-2019/year-wish/index.js

@@ -14,6 +14,7 @@ class YarnWish extends Component {
     componentDidMount() {
         this.fetchCourse()
         this.getStage()
+        document.title = `七月在线年终大回馈，人气好课免费学，精品课程1分抢！`
     }
 
     componentWillUpdate() {