Merge branch '00'

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

@@ -345,9 +345,9 @@ class MyTreasure extends Component {
   handleToInvite = (treasure_code) => {
     const {history} = this.props
     if (getParam('version')) {
-      history.push(`/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1&version=${getParam('version')}`)
+      window.location.assign(`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1&version=${getParam('version')}`)
     } else {
-      history.push(`/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1`)
+      window.location.assign(`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1`)
     }
   }
 

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

@@ -138,8 +138,8 @@ class TreasureTeam extends Component {
             <>
               {
                 is_captain
-                ? <Link className="team-button" to={`/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1`}>继续邀请队友</Link>
-                : <Link className="team-button" to={`/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=2`}>帮好友完成组队</Link>
+                ? <a className="team-button" href={`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1`}>继续邀请队友</a>
+                : <a className="team-button" href={`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=2`}>帮好友完成组队</a>
               }
             </>
           }
@@ -176,4 +176,4 @@ class TreasureTeam extends Component {
   }
 }
 
-export default TreasureTeam;
\ No newline at end of file
+export default TreasureTeam;

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

@@ -102,9 +102,9 @@ class TeamInfo extends Component {
         // 直接跳转
 
         if (!getParam('version')) {
-          this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
+          window.location.assign('https://h5.julyedu.com/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'));
+          window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code + '&version='+ getParam('version'));
         }
 
       }else{ // 没自己的队伍
@@ -114,9 +114,9 @@ class TeamInfo extends Component {
           if (code === 200) {
             const { treasure_code } = data;
             if (!getParam('version')) {
-              this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
+              window.location.assign('https://h5.julyedu.com/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'));
+              window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code + '&version='+ getParam('version'));
             }
           } else {
             Toast.info(msg);