Merge branch 'red-envelope-statistics'

# Conflicts:
#	src/components/detail/redPacket/index.js

src/App.js

-import React, {Component} from 'react'
+import React, { Component } from 'react'
 import Routes from './router'
 import cookie from 'js-cookie'
-import {connect} from "react-redux";
-import {setCurrentUser, startFetchUser} from "@/store/userAction";
-import {withRouter} from 'react-router-dom'
-import {compose} from 'redux'
-import {getParam, http, browser} from "@/utils";
-import {Toast} from "antd-mobile";
-import {addDays} from 'date-fns'
+import { connect } from "react-redux";
+import { setCurrentUser, startFetchUser } from "@/store/userAction";
+import { withRouter } from 'react-router-dom'
+import { compose } from 'redux'
+import { getParam, http, browser } from "@/utils";
+import { Toast } from "antd-mobile";
+import { addDays } from 'date-fns'
 
 
 //拦截ajax请求，返回mock数据
@@ -70,12 +70,18 @@ class App extends Component {
                     return
                 }
                 location.state = {from: this.previousLocation};
+            } else {
+                this.removeShareCodeCookie()
             }
         })
 
 
     }
 
+    removeShareCodeCookie = () => {
+        cookie.remove('share_code', {path: '/', domain: '.julyedu.com'})
+    }
+
     setNavigationRecord = (location) => {
         let {location: _location} = this.props
         let {state: _state = {}} = _location
@@ -165,6 +171,8 @@ class App extends Component {
     transformUser = res => {
         let payload
         if (res.data.code === 200) {
+            //移除红包统计cookie
+            this.removeShareCodeCookie()
             const {
                 msg, data: {
                     avatar_file: avatar,
@@ -200,6 +208,8 @@ class App extends Component {
     transformWxUser = res => {
         let data = res.data
         if (data.errno == 200) {
+            //移除红包统计cookie
+            this.removeShareCodeCookie()
             let {uid, token, avatar_file: avatar, uname: username,} = data.data
 
             return {

src/components/detail/redPacket/index.js

@@ -9,6 +9,7 @@ import { Toast } from 'antd-mobile';
 import Captcha from '@/common/Captcha';
 import FollowQRcode from './../followQRcode';
 import './index.scss';
+import cookie from 'js-cookie'
 
 class RedPacket extends PureComponent {
 
@@ -54,9 +55,16 @@ class RedPacket extends PureComponent {
     // 分享链接进入
     this.judgePopupType();
 
+    window.addEventListener('beforeunload', this.removeStatisticsCookie)
+
+
+
     // 微信进入
     const isWechat = getParam('wechat');
     const { userInfo } = this.props;
+    if(!userInfo || !userInfo.uid) {
+      this.setRelativeCookie()
+    }
     if(isWechat === '1' && !browser.isWeixin) {
       if(userInfo && userInfo.uid) {
         const type = window.localStorage.getItem('redpacket-click');
@@ -95,6 +103,7 @@ class RedPacket extends PureComponent {
           window.localStorage.removeItem('redpacket-click');
         }
       }else {
+        this.setRelativeCookie()
         this.setState({
           type: 1
         });
@@ -103,6 +112,15 @@ class RedPacket extends PureComponent {
     this.fetchShareInfo();
   }
 
+  removeStatisticsCookie = () => {
+    cookie.remove('share_code', {path: '/', domain: '.julyedu.com'})
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener('beforeunload', this.removeStatisticsCookie)
+  }
+
+
   // 获取分享信息
   fetchShareInfo = () => {
 
@@ -582,6 +600,13 @@ class RedPacket extends PureComponent {
     });
   }
 
+
+  //设置统计信息
+  setRelativeCookie = () => {
+    const config = {path: '/', domain: '.julyedu.com'}
+    cookie.set('share_code', getParam('share_code') ? getParam('share_code') : 'share_code', config)
+  }
+
   render() {
     // console.log(this.props);
     const { history, userInfo } = this.props;