pull

src/components/detail/btnstatus/index.js

@@ -214,6 +214,16 @@ class BtnStatus extends Component {
         }
     }
 
+    // 开始学习
+    toStudy=(vCourseId,isHaveVideo)=>{
+        const { history } = this.props;
+        if(isHaveVideo == 0){
+            Toast.info('尚未开课，开课后立即上传课程～', 2)
+        } else {
+            history.push(`/play/video?id=${vCourseId}`)
+        }
+    }
+
 
     //获取砍价信息
     getBargainInfo = () => {
@@ -269,7 +279,9 @@ class BtnStatus extends Component {
                             <i className='iconfont iconerji' />
                             <span>课程咨询</span>
                         </a>
-                        <Link to={`/play/video?id=${info.v_course_id}`} className='btn btn-m bg-09f'>开始学习</Link>
+                        <a className='btn btn-m bg-09f' onClick={() => this.toStudy(info.v_course_id,info.is_have_video)}>
+                            开始学习
+                        </a>
                     </div>
                 }
                 {/*拼团 未开团*/}
@@ -372,10 +384,7 @@ class BtnStatus extends Component {
                         {
                             info.aist_start_time === "" ?
                                 (
-                                    <Link to={`/play/video?id=${info.v_course_id}`} className='btn btn-m learn-now'>
-                                        <span>开始学习</span>
-                                    </Link>
-
+                                    <a className='btn btn-m bg-09f' onClick={() => this.toStudy(info.v_course_id,info.is_have_video)}>开始学习</a>
                                 ) : (
                                     <button className='btn btn-m wait-open' >
                                         <span>{this.formatDate(info.aist_start_time)}</span>

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;