Merge branch '00'

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

@@ -290,7 +290,7 @@ class Landing extends Component {
   }
 
   showShareTip = () => {
-    const {user} = this.props
+    const {user, location} = this.props
     if (browser.isAndroidApp || browser.isIOSApp) {
 
       SendMessageToApp('toShare', {
@@ -301,12 +301,11 @@ class Landing extends Component {
       })
 
     } else {
-      const {history, match, user} = this.props
       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`,
+          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`)