Merge branch 'red-envelope-statistics' into pre

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

src/components/detail/redPacket/index.js

@@ -55,13 +55,14 @@ class RedPacket extends PureComponent {
     // 分享链接进入
     this.judgePopupType();
 
-
     window.addEventListener('beforeunload', this.removeStatisticsCookie)
 
+
+
     // 微信进入
     const isWechat = getParam('wechat');
     const { userInfo } = this.props;
-    if(!userInfo || !userInfo.uid){
+    if(!userInfo || !userInfo.uid) {
       this.setRelativeCookie()
     }
     if(isWechat === '1' && !browser.isWeixin) {
@@ -102,6 +103,7 @@ class RedPacket extends PureComponent {
           window.localStorage.removeItem('redpacket-click');
         }
       }else {
+        this.setRelativeCookie()
         this.setState({
           type: 1
         });
@@ -121,7 +123,6 @@ class RedPacket extends PureComponent {
 
   // 获取分享信息
   fetchShareInfo = () => {
-
     const share_code = getParam('share_code');
     http.get(`${API.home}/sys/redPacket/shareUrl/${getParam('id')}`).then(res => {
       const { code, data } = res.data;
@@ -596,7 +597,7 @@ class RedPacket extends PureComponent {
   setRelativeCookie = () => {
     const config = {path: '/', domain: '.julyedu.com'}
     const {shareInfo} = this.state
-    cookie.set('share_code', shareInfo && shareInfo.share_code ? shareInfo.share_code : 'share_code:share_code', config)
+    cookie.set('share_code', shareInfo && shareInfo.share_code ? shareInfo.share_code : 'share_code', config)
   }
 
   render() {