分享

src/components/activity/invite.js

@@ -21,7 +21,11 @@ class Invite extends Component {
     let uid = jsCookie.get('uid');
     let shareuid = getParam('shareuid');
     if(uid === shareuid) {
+<<<<<<< HEAD
 
+=======
+      
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
     } else {
       if(getParam('new')) {
         this.props.history.push(`/activity?shareuid=${shareuid}&code=${inviteCode}`);
@@ -81,10 +85,17 @@ class Invite extends Component {
           if(is_weixin()) {
             // TODO 这里需要运营确定文案
             wxShare({
+<<<<<<< HEAD
               title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
               desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
               link: encodeURI(location.origin + `/invite?shareuid=${jsCookie.get('uid')}&new=1&code=${inviteCode}`),
               imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
+=======
+              title: "哈哈哈哈哈哈哈",
+              desc: "你的老相好在七月在线学习呢你来不来",
+              link: encodeURI(location.origin + `/invite?shareuid=${jsCookie.get('uid')}&new=1&code=${inviteCode}`),
+              imgUrl: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/20a86c1353.jpg'
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
             });
             this.setState({
               showTip: true,
@@ -139,7 +150,11 @@ class Invite extends Component {
               </div>
             </div>
           </div>
+<<<<<<< HEAD
 
+=======
+        
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
 
           <div className="but__con">
             <div className="button__content" onClick={this.inviteFriends}>