Merge branch '00'

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

@@ -147,9 +147,9 @@ class Landing extends Component {
     const {history} = this.props
     this.joinSuccessPopup && this.joinSuccessPopup.remove()
     if (getParam('version')) {
-      history.push(`/year/yearTreasure?id=${id}&version=${getParam('version')}`)
+      window.location.assign(`https://h5.julyedu.com/year/yearTreasure?id=${id}&version=${getParam('version')}`)
     } else {
-      history.push(`/year/yearTreasure?id=${id}`)
+      window.location.assign(`https://h5.julyedu.com/year/yearTreasure?id=${id}`)
     }
   }
 
@@ -380,9 +380,9 @@ class Landing extends Component {
   toSquare = () => {
     const {history} = this.props
     if (!getParam('version')) {
-      history.push('/year/yearindex')
+      window.location.assign('https://h5.julyedu.com/year/yearindex')
     } else {
-      history.push('/year/yearindex?version=' + getParam('version'))
+      window.location.assign('https://h5.julyedu.com/year/yearindex?version=' + getParam('version'))
     }
   }