Merge branch '11-11' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 11-11

src/components/activity/index.js

 import React, { Component } from 'react'
 import {connect} from "react-redux";
 import { http, getParam } from '@/utils';
+import cookie from 'js-cookie'
 import './index.scss';
 import {Toast} from "antd-mobile";
 import jsCookie from 'js-cookie';
@@ -8,11 +9,19 @@ import jsCookie from 'js-cookie';
 class Activity extends Component {
   constructor(props) {
     super(props);
+    this.state = {
+      'butText': '立即领取'
+    }
   }
 
   componentWillMount() {
     jsCookie.set('blessing_invite_uid', getParam('shareuid'), {domain: '.julyedu.com', expires: 30});
     jsCookie.set('blessing_invite_code', getParam('inviteCode'), {domain: '.julyedu.com', expires: 30});
+    if(cookie.get('uid')) {
+      this.setState(()=>({
+        butText: '已领取'
+      }));
+    }
   }
 
   getGift = () => {
@@ -20,15 +29,17 @@ class Activity extends Component {
       this.props.history.push('/passport');
     } else {
       Toast.info('领取成功，你可前往七月在线官网/APP进行查看', 2);
+      localStorage.setItem('lingqu', 1);
     }
   }
 
   render() {
+    const {butText} = this.state;
     return (
       <div className="activity__con">
         <div className='banner__con'></div>
         <div className='content__con'>
-          <div className="button__get" onClick={this.getGift}>立即领取</div>
+          <div className="button__get" onClick={this.getGift}>{butText}</div>
         </div>
       </div>
     )

src/components/activity/invite.js

@@ -201,8 +201,8 @@ class Invite extends Component {
                     return (
                       <div className="user__item-info item__con-only" key={index}>
                         <div className="item__con">
-                          <img className="user_avatar" src={item.avatar} />
-                          <div className="user_name">{item.name}</div>
+                          <img className="user_avatar" src={item.head_image} />
+                          <div className="user_name">{item.user_name}</div>
                         </div>
                       </div>
                     )

src/components/blessingPreheat/collectBlessing/index.js

@@ -180,7 +180,11 @@ class CollectBlessing extends Component {
         history.push('/passport')
       }
     }else {
-      history.push('/invite')
+      if(getParam('version')) {
+        history.push('/invite?version=' + getParam('version'))
+      } else {
+        history.push('/invite')
+      }
     }
   }