Merge branch '00' into dev

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

@@ -158,7 +158,7 @@ class Landing extends Component {
         this.fetchPageData()
         this.getFollowStatus()
           .then(isFollow => {
-            !isFollow && this.remind('join', this.state.treasure_code)
+            !isFollow && this.remind('join', this.state.treasure_code, 2)
           })
       }
     })
@@ -191,7 +191,7 @@ class Landing extends Component {
       return code === 200 && data['is_follow']
     })
 
-  createTeamSuccess = (member, team_num, lack_member, treasure_code) => {
+  createTeamSuccess = ({member, team_num, lack_member, treasure_code}) => {
     this.joinSuccessPopup && this.joinSuccessPopup.remove() && (this.joinSuccessPopup = null)
     this.getFollowStatus()
       .then(isFollow => {
@@ -233,7 +233,7 @@ class Landing extends Component {
       })
   }
 
-  remind = (type = 'create', treasure_code) => {
+  remind = (type = 'create', treasure_code, origin = 1) => {
     const {match, history, user} = this.props
     http.get(`${API["base-api"]}/wx/user_temporary_qrcode/${user.data.uid}`)
       .then(res => {
@@ -255,7 +255,7 @@ class Landing extends Component {
             // history.replace(`${match.path}?treasure_code=${treasure_code}&origin=1`)
             this.fetchPageData({
               treasure_code,
-              origin: '1'
+              origin
             })
           }
         })
@@ -290,7 +290,7 @@ class Landing extends Component {
           sessionStorage.removeItem('showShareTip')
           this.getFollowStatus()
             .then(isFollow => {
-              !isFollow && this.remind('create', getParam('treasure_code'))
+              !isFollow && this.remind('create', getParam('treasure_code'), 1)
             })
         }
       })