分享

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}>

src/components/blessingPreheat/index.js

+<<<<<<< HEAD
 import React, { Component } from 'react';
 import QRCode from 'qrcode';
 import { http, SendMessageToApp,wxShare,is_weixin} from '@/utils';
 import { Link } from 'react-router-dom';
 import { throttle, findIndex } from 'lodash';
+=======
+import React, { Component } from 'react'
+import QRCode from 'qrcode'
+import { http, SendMessageToApp } from '@/utils'
+import { Link } from 'react-router-dom'
+import { throttle, findIndex, debounce } from 'lodash'
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
 import RulePopup from './rulePopup/index'
 import CoursePopup from './coursePopup/index'
 import RecordPopup from './recordPopup/index'
-import CourseList from './courseList/index';
-import SharePopup from './sharePopup/index';
-import LuckDraw from './luckDraw/index';
-import CollectBlessing from './collectBlessing/index';
-import ReserveCourse from './ReserveCourse/index';
-import ListHeader from './listHeader/index';
-import LevelTest from './levelTest/index';
-import RankList from './rankList/index';
+import CourseList from './courseList/index'
+import SharePopup from './sharePopup/index'
+import LuckDraw from './luckDraw/index'
+import CollectBlessing from './collectBlessing/index'
+import ReserveCourse from './ReserveCourse/index'
+import ListHeader from './listHeader/index'
+import LevelTest from './levelTest/index'
+import RankList from './rankList/index'
 import './index.scss'
 import { Popup } from '@/common'
-import {CopyToClipboard} from 'react-copy-to-clipboard'
+import { CopyToClipboard } from 'react-copy-to-clipboard'
 import { Toast } from "antd-mobile"
 import Live from './live'
 import Banner from './banner'
+<<<<<<< HEAD
 import { getParam } from '../../utils';
+=======
+import { getParam } from '../../utils'
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
 
 
 class BlessingPreheat extends Component {
 
   constructor(props) {
     super(props)
-    this.navTop = 183;
-    this.prevY = 0;
+    this.navTop = 183
+    this.prevY = 0
     this.state = {
       isRule: false,
       isCourse: false,
@@ -74,6 +86,7 @@ class BlessingPreheat extends Component {
   }
 
   componentDidMount() {
+<<<<<<< HEAD
     this.fetchUserBlessing();
     window.addEventListener('scroll', throttle(this.calcNavActive, 100));
     if(is_weixin()) {
@@ -84,23 +97,62 @@ class BlessingPreheat extends Component {
         imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
       })
     }
+=======
+    this.fetchUserBlessing()
+    this.setInitialNavActiveStatus()
+
+    window.addEventListener('scroll', throttle(this.calcNavActive, 100))
+  }
+
+  getActiveIndex = (arr, n) => {
+    for (let i = 0, len = arr.length; i < len; i++) {
+      if (arr[i] > n) {
+        if (!i) {
+          return i
+        } else {
+          if (Math.abs(n - arr[i]) < Math.abs(n - arr[i - 1])) {
+            return i
+          } else {
+            return i - 1
+          }
+        }
+      }
+    }
+    return arr.length - 1
+  }
+
+  setInitialNavActiveStatus = () => {
+    const observer = new MutationObserver(debounce((list, observer) => {
+      const navs = this.state.navs.map(item => document.querySelector(`#${item.id}`))
+      if (navs.every(item => item)) {
+        const navsTop = navs.map(item => item.offsetTop)
+        const index = this.getActiveIndex(navsTop, window.pageYOffset)
+        this.setState({index, navsTop}, () => {
+          this.calcNavActive()
+          observer.disconnect()
+        })
+      }
+    }, 30))
+    observer.observe(document.querySelector('#blessing-preheat'), {childList: true, subtree: true})
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
   }
 
   initNav = (isFormal) => {
-    const { navs } = this.state;
-    if(isFormal) {
+    const {navs} = this.state
+    if (isFormal) {
       this.setState({
         navs: navs.filter(item => item.id !== 'deposit')
-      });
+      })
     }
   }
 
   fetchMoudleId = (str) => {
-    const { navs } = this.state;
-    return findIndex(navs, item => item.id === str);
+    const {navs} = this.state
+    return findIndex(navs, item => item.id === str)
   }
 
   fetchUserBlessing() {
+<<<<<<< HEAD
     // 判断登录未登录 根据this.state.userInfo.isLogin
     if(getParam('version')) {
       // app 平台
@@ -108,9 +160,18 @@ class BlessingPreheat extends Component {
       // H5
     }
     const { userInfo } = this.state;
+=======
+    // 判断登录未登录 根据this.state.userInfo.isLogin 
+    if (getParam('version')) {
+      // app 平台
+    } else {
+      // H5
+    }
+    const {userInfo} = this.state
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
     http.get(`${API.home}/sys/user/blessing`).then(res => {
-      const { code, data } = res.data;
-      if(code === 200) {
+      const {code, data} = res.data
+      if (code === 200) {
         this.setState({
           isSign: !!data.today_signed,
           isFormal: data.is_activity,
@@ -118,38 +179,39 @@ class BlessingPreheat extends Component {
             isLogin: !!data.is_login,
             blessingVal: data.user_blessing_value,
           })
-        });
-        if(data.is_login === 1) {
-          this.handleToSign();
+        })
+        if (data.is_login === 1) {
+          this.handleToSign()
         }
-        this.initNav(data.is_activity);
+        this.initNav(data.is_activity)
       }
-    });
+    })
   }
 
   handleToSign = () => {
     http.post(`${API.home}/sys/add/blessing`, {
       type: 1 // 1：签到；3：分享；4：浏览课程；
     }).then(res => {
-      const {code } = res.data;
+      const {code} = res.data
       if (code === 200) {
         this.setState({
           isSign: true,
-        });
-        Toast.info('+5点福气值~', 2, null, false);
+        })
+        Toast.info('+5点福气值~', 2, null, false)
       }
-    });
+    })
   }
 
   handleToHide = (key) => {
     let obj = {}
-    obj[key] = false;
+    obj[key] = false
     this.setState({
       ...obj
     })
   }
 
   handleToShow = (key, isLogin = false) => {
+<<<<<<< HEAD
     const { userInfo } = this.state;
     // 需要用户登录 并且用户未登录
     if(isLogin && !userInfo.isLogin) {
@@ -157,22 +219,38 @@ class BlessingPreheat extends Component {
     }else{
       let obj = {};
       obj[key] = true;
+=======
+    const {userInfo} = this.state
+    // 需要用户登录 并且用户未登录
+    if (isLogin && !userInfo.isLogin) {
+      this.toLogin()
+    } else {
+      let obj = {}
+      obj[key] = true
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
       this.setState({
         ...obj
-      });
+      })
     }
   }
 
   // 邀请好友注册
   handleToShowInvite = () => {
+<<<<<<< HEAD
     const { userInfo } = this.state;
     if(userInfo.isLogin) {
       if(!getParam('version')) {
+=======
+    const {userInfo} = this.state
+    if (userInfo.isLogin) {
+      if (!getParam('version')) {
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
         QRCode.toDataURL('http://m.julyedu.com/invite', {
           width: 120,
           height: 120,
           margin: 1
         })
+<<<<<<< HEAD
         .then(url => {
           this.setState({
             inviteUrl: url,
@@ -183,6 +261,18 @@ class BlessingPreheat extends Component {
           console.error(err)
         });
       }else{
+=======
+          .then(url => {
+            this.setState({
+              inviteUrl: url,
+              inviteVisible: true
+            })
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      } else {
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
         let data = {
           title: '11.11-11.13 AI充电节，预热来袭！重磅好课1折秒，超10万元奖品来就送-七月在线', // 标题
           desc: '11.11-11.13 AI充电节，预热来袭！重磅好课1折秒，超10万元奖品来就送-七月在线', // 描述
@@ -192,19 +282,24 @@ class BlessingPreheat extends Component {
         SendMessageToApp("toShare", data)
       }
     } else {
+<<<<<<< HEAD
       this.toLogin();
+=======
+      this.toLogin()
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
     }
   }
 
   handleToShowNotice = () => {
     http.get(`${API['base-api']}/sys/activity/create_blessing_qrcode`).then(res => {
-      const {errno, data} = res.data;
+      const {errno, data} = res.data
       if (errno === 200) {
         QRCode.toDataURL(data.url, {
           width: 120,
           height: 120,
           margin: 1
         })
+<<<<<<< HEAD
         .then(url => {
           this.setState({
             isServer: true,
@@ -216,8 +311,30 @@ class BlessingPreheat extends Component {
         });
       }else if(errno === 4030 || errno === 4040) {
         this.toLogin();
+=======
+          .then(url => {
+            this.setState({
+              isServer: true,
+              serverUrl: url,
+            })
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      } else if (errno === 4030 || errno === 4040) {
+        this.toLogin()
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
       }
-    });
+    })
+  }
+
+  toLogin = () => {
+    const {history} = this.props
+    if (!getParam('version')) {
+      history.push('/passport')
+    } else {
+      SendMessageToApp("toLogin")
+    }
   }
 
   toLogin = () => {
@@ -230,20 +347,20 @@ class BlessingPreheat extends Component {
   }
 
   onCopy = () => {
-    Toast.info('复制成功', 2,null,false)
+    Toast.info('复制成功', 2, null, false)
   }
 
   toSection = (i, e) => {
-    const { navs } = this.state;
-    e.preventDefault();
+    const {navs} = this.state
+    e.preventDefault()
     let top = document.querySelector(`#${navs[i].id}`).offsetTop
     this.setState({
       index: i
-    });
+    })
     window.scrollTo({
       top: top - 60,
       left: 0
-    });
+    })
   }
 
   calcNavActive = () => {
@@ -259,7 +376,11 @@ class BlessingPreheat extends Component {
     }
     let el = document.querySelector(`#${navs[_index].id}`)
     let nav = document.querySelector('#main-nav')
+<<<<<<< HEAD
     if(el) {
+=======
+    if (el) {
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
       let top = el.offsetTop
 
       if (y <= this.navTop) {
@@ -300,6 +421,7 @@ class BlessingPreheat extends Component {
       showRecordList,
       shareMark,
       index
+<<<<<<< HEAD
     } = this.state;
     const {history} = this.props;
     return (
@@ -310,8 +432,20 @@ class BlessingPreheat extends Component {
         toSection={this.toSection}
         index={index}
          />
+=======
+    } = this.state
+    const {history} = this.props
+    return (
+      <div id={'blessing-preheat'}>
+        <Banner
+          isFormal={isFormal}
+          navs={navs}
+          toSection={this.toSection}
+          index={index}
+        />
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
         {/* 积福气 */}
-        <ListHeader id={'lucky-value'} text="积福气，享受更多福利" styles={{margin: '60px 0 15px'}} />
+        <ListHeader id={'lucky-value'} text="积福气，享受更多福利" styles={{margin: '60px 0 15px'}}/>
         <Link className="luck-draw__button" to="/blessingRank">福气排行榜></Link>
         <CollectBlessing
           isSign={isSign}
@@ -328,22 +462,26 @@ class BlessingPreheat extends Component {
         />
 
         {/* 幸运大抽奖--预热 */}
-        <ListHeader id={'lucky-draw'} text="幸运大抽奖" styles={{margin: '30px 0 10px'}} />
+        <ListHeader id={'lucky-draw'} text="幸运大抽奖" styles={{margin: '30px 0 10px'}}/>
         <p className="luck-draw__tip">- 将于11月11日10点开启 -</p>
         <button className="luck-draw__button" onClick={() => this.handleToShow('isRule')}>活动规则></button>
-        <LuckDraw />
+        <LuckDraw/>
 
         {/*定金--只在预热期间显示*/}
         {
           isFormal === 0 &&
           <>
-            <ListHeader id={'deposit'} text="预付1元定金，最高可省100元" styles={{margin: '30px 0 15px'}} />
-            <ReserveCourse />
+            <ListHeader id={'deposit'} text="预付1元定金，最高可省100元" styles={{margin: '30px 0 15px'}}/>
+            <ReserveCourse/>
           </>
         }
 
         {/* 精品课程特惠专区 */}
+<<<<<<< HEAD
         <ListHeader id={'best-courses'} text="精品课程特惠专区" styles={{margin: '30px 0 15px'}} />
+=======
+        <ListHeader id={'best-courses'} text="精品课程特惠专区" styles={{margin: '30px 0 15px'}}/>
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
         <CourseList isFormal={isFormal} isLogin={userInfo.isLogin} toLogin={this.toLogin}/>
 
         {
@@ -352,7 +490,12 @@ class BlessingPreheat extends Component {
         }
         {
           isCourse &&
+<<<<<<< HEAD
           <CoursePopup toLogin={this.toLogin} history={history} isLogin={userInfo.isLogin} handleToHide={() => this.handleToHide('isCourse')}/>
+=======
+          <CoursePopup toLogin={this.toLogin} history={history} isLogin={userInfo.isLogin}
+                       handleToHide={() => this.handleToHide('isCourse')}/>
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
         }
         {
           showRecordList &&
@@ -360,7 +503,7 @@ class BlessingPreheat extends Component {
         }
         {
           shareMark &&
-          <SharePopup />
+          <SharePopup/>
         }
         <Popup
           visible={inviteVisible}
@@ -381,8 +524,11 @@ class BlessingPreheat extends Component {
         </Popup>
 
 
+<<<<<<< HEAD
 
 
+=======
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
         <Popup visible={this.state.joinLotteryVisible}
                title={'你已成功参与本时段抽奖'}
                className={'join-lottery'}
@@ -391,20 +537,29 @@ class BlessingPreheat extends Component {
             <div className="code">抽奖码为：99999999</div>
             <div className="time">本时段的中奖结果将在xx:xx公布</div>
             <div className="hint">你可关注‘七月在线’服务号第一时间获得中奖信息。</div>
-            <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/tinypng-common/right_weixin.png" className='qr-code' alt=""/>
+            <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/tinypng-common/right_weixin.png"
+                 className='qr-code' alt=""/>
           </div>
 
-          <button onClick={() => {this.setState({joinLottery: false})}}>知道了</button>
+          <button onClick={() => {
+            this.setState({joinLottery: false})
+          }}>知道了
+          </button>
         </Popup>
         <Popup title={'微信扫码分享到微信朋友圈'}
                visible={this.state.timelineShareVisible}
                className={'timeline-share'}
         >
-          <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/tinypng-common/right_weixin.png" alt="" className="qr-code"/>
+          <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/tinypng-common/right_weixin.png" alt=""
+               className="qr-code"/>
         </Popup>
 
 
+<<<<<<< HEAD
         <ListHeader id={'ai-test'} text="全国AI工程师水平测试" styles={{margin: '30px 0 15px'}} />
+=======
+        <ListHeader id={'ai-test'} text="全国AI工程师水平测试" styles={{margin: '30px 0 15px'}}/>
+>>>>>>> c7f5958a86fc21ab5be3a03fb9e7277cfb2be9ba
         <div className="test__record" onClick={() => this.handleToShow('showRecordList', true)}>
           测试记录>
         </div>
@@ -419,4 +574,4 @@ class BlessingPreheat extends Component {
   }
 }
 
-export default BlessingPreheat;
+export default BlessingPreheat