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

src/components/activity/newyear-2019/common/system-bullet-screen/index.js

@@ -61,7 +61,7 @@ class SystemBulletScreen extends Component {
       }, 1000)
     } else {
       setTimeout(() => {
-        ++this.count;
+        ++this.count
         swiper.slideNext()
       }, 3000)
     }
@@ -93,11 +93,7 @@ class SystemBulletScreen extends Component {
 
   render() {
     const {
-      bullets = [
-        '第一条消息，第一条消息，第一条消息，第一条消息，第一条消息，第一条消息，',
-        '第二条消息，第二条消息，第二条消息，第二条消息，第二条消息，第二条消息，',
-        '第三条消息，第三条消息，第三条消息，第三条消息，第三条消息，第三条消息，',
-      ]
+      bullets
     } = this.props
     return (
       this.state.showNotices &&

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

@@ -10,6 +10,7 @@ import { browser, getParam, http, wxShare, SendMessageToApp } from "@/utils"
 import { Link } from "react-router-dom"
 import QRCode from "qrcode"
 import YearCourse from '../preheat/YearCourse'
+import jsCookie from "js-cookie"
 
 
 class Landing extends Component {
@@ -169,13 +170,21 @@ class Landing extends Component {
 
   inviteMembers = treasure_code => {
     const {history, match, user, location} = this.props
+    if (getParam('version')) {
+      let data = {
+        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'
+      }
+      SendMessageToApp("toShare", data)
+    }
     if (browser.isWeixin) {
       wxShare({
         title: `@${user.data.username} 邀您一起组队拿豪礼！`,
         desc: `加入我的队伍，机械键盘，纸质书籍等超多奖品等你拿！`,
         link: `${window.location.origin}/${location.pathname}?treasure_code=${treasure_code}&origin=2`,
-        //todo 分享图片更换
-        imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newIndex/community/tou5_bj.png'
+        imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/wx-share-icon.png'
       })
     }
     sessionStorage.setItem('showShareTip', '1')

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

@@ -70,6 +70,7 @@ class TeamInfo extends Component {
         this.props.history.push(`/year/yearTreasure${search}?version=${getParam('version')}`);
       }
     }
+
   }
 
   // 去登录
@@ -89,14 +90,24 @@ class TeamInfo extends Component {
       const {is_my_team, my_team: {treasure_code}} = this.state;
       if(is_my_team) { // 有自己的队伍
         // 直接跳转
-        this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
+
+        if (!getParam('version')) {
+          this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
+        } else {
+          this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code + '&version='+ getParam('version'));
+        }
+
       }else{ // 没自己的队伍
         // 请求创建队伍的接口
         http.get(`${API.home}/sys/treasure/createMyTeam`).then(res => {
           const { code, data, msg } = res.data;
           if (code === 200) {
             const { treasure_code } = data;
-            this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
+            if (!getParam('version')) {
+              this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
+            } else {
+              this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code + '&version='+ getParam('version'));
+            }
           } else {
             Toast.info(msg);
           }