Merge branch '00'

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

@@ -92,7 +92,7 @@ class Landing extends Component {
   }
 
   showSharePromptWithParam = () => {
-    if (sessionStorage.getItem('showShareTip')) {
+    if (sessionStorage.getItem('showShareTip') && !sessionStorage.getItem('closedRemind')) {
       this.showShareTip()
     }
   }
@@ -287,6 +287,7 @@ class Landing extends Component {
             </div>,
             close: () => {
               // history.replace(`${match.path}?treasure_code=${treasure_code}&origin=1`)
+              sessionStorage.setItem('closedRemind', '1')
               this.fetchPageData({
                 treasure_code,
                 origin
@@ -356,7 +357,11 @@ class Landing extends Component {
     const {history, user} = this.props
 
     if (user.hasError) {
+      if (browser.isWeixin) {
+        window.location.assign(`https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=${encodeURIComponent(window.location.href + '&aa=bb')}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`)
+      } else {
         history.push('/passport')
+      }
       return true
     }
   }