Skip to content

M
mr-julyedu
Commit e371b5bb by zhanghaozhe
Options

Merge branch '11-11' into dev 

# Conflicts:
#	src/components/blessingPreheat/index.js
parents 437700d1 880ef959
Showing with 532 additions and 553 deletions
src/common/closable-popup/index.js
import React, { Component } from 'react' import React from 'react'
import ReactDOM from 'react-dom'
import './index.scss' import './index.scss'
import classnames from 'classnames' import classnames from 'classnames'
import propTypes from 'prop-types'
class ClosablePopup extends Component { function ClosablePopup({
title, content, className, closable = true, close = function () {
state = {
visible: this.props.visible
} }
} = {}) {
close = () => { function unmountComponent() {
const {close} = this.props ReactDOM.unmountComponentAtNode(div)
close ? close() : this.setState({visible: false}) if (div && div.parentNode) {
div.parentNode.removeChild(div)
}
} }
componentDidUpdate(prevProps, prevState) { function _close() {
const {visible} = this.props let _c = close()
if (prevState.visible !== this.props.visible) { if (_c && _c.then) {
this.setState({ _c.then(() => {
visible unmountComponent()
}) })
} else {
unmountComponent()
} }
} }
render() { const closablePopup = (
const {title, className, children, closable = true} = this.props <div className={'closable-popup-mask'}>
return ( <div className={classnames(['popup-container', className])}>
this.state.visible <div className="title">{title}</div>
? <div className="content">
<div className={'closable-popup-mask'}> {content}
<div className={classnames(['popup-container', className])}>
<div className="title">{title}</div>
<div className="content">
{children}
</div>
{
closable && <i className={'close iconfont iconiconfront-2'} onClick={this.close}/>
}
</div>
</div> </div>
: null {
) closable && <i className={'close iconfont iconiconfront-2'} onClick={_close}/>
} }
} </div>
</div>
)
const div = document.createElement('div')
document.body.appendChild(div)
ClosablePopup.propTypes = { ReactDOM.render(closablePopup, div)
title: propTypes.string.isRequired,
visible: propTypes.bool,
closable: propTypes.string,
close: propTypes.func
} }
export default ClosablePopup export default ClosablePopup
src/components/blessingPreheat/index.js
import React, {Component} from 'react' import React, { Component } from 'react'
import QRCode from 'qrcode' import QRCode from 'qrcode'
import {http, SendMessageToApp, wxShare, is_weixin, getParam} from '@/utils'; import { http, SendMessageToApp, wxShare, is_weixin, getParam } from '@/utils'
import {Link} from 'react-router-dom' import { Link } from 'react-router-dom'
import {throttle, findIndex, debounce} from 'lodash' import { throttle, findIndex, debounce } from 'lodash'
import RulePopup from './rulePopup/index' import RulePopup from './rulePopup/index'
import CoursePopup from './coursePopup/index' import CoursePopup from './coursePopup/index'
import RecordPopup from './recordPopup/index' import RecordPopup from './recordPopup/index'
...@@ -15,508 +15,498 @@ import ListHeader from './listHeader/index' ...@@ -15,508 +15,498 @@ import ListHeader from './listHeader/index'
import LevelTest from './levelTest/index' import LevelTest from './levelTest/index'
import RankList from './rankList/index' import RankList from './rankList/index'
import './index.scss' import './index.scss'
import {Popup} from '@/common' import { Popup } from '@/common'
import {CopyToClipboard} from 'react-copy-to-clipboard' import { CopyToClipboard } from 'react-copy-to-clipboard'
import {Toast} from "antd-mobile" import { Toast } from "antd-mobile"
import Live from './live' import Live from './live'
import Banner from './banner' import Banner from './banner'
import cookie from "js-cookie"; import cookie from "js-cookie"
import {setCurrentUser, startFetchUser} from "@/store/userAction" import { setCurrentUser, startFetchUser } from "@/store/userAction"
import {addDays} from "date-fns"; import { addDays } from "date-fns"
import {compose} from "redux"; import { compose } from "redux"
import {connect} from "react-redux"; import { connect } from "react-redux"
class BlessingPreheat extends Component { class BlessingPreheat extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.navTop = 183 this.navTop = 183
this.prevY = 0 this.prevY = 0
this.state = { this.state = {
// userInfoList: [], userInfoList: [],
userInfoList: [{ // userInfoList: [{
token:'fcfef221e60ab7a2-92a80d5d30196999', // token:'fcfef221e60ab7a2-92a80d5d30196999',
uid:'545292', // uid:'545292',
uname:'xzhtest2', // uname:'xzhtest2',
avatar_file:'' // avatar_file:''
}], // }],
isRule: false, isRule: false,
isCourse: false, isCourse: false,
inviteUrl: '', inviteUrl: '',
inviteVisible: false, inviteVisible: false,
joinLotteryVisible: false, joinLotteryVisible: false,
timelineShareVisible: false, timelineShareVisible: false,
showRecordList: false, showRecordList: false,
isFormal: false, // 1正式 0 预热 isFormal: false, // 1正式 0 预热
isServer: false, isServer: false,
serverUrl: '', serverUrl: '',
shareMark: false, shareMark: false,
userInfo: {}, userInfo: {},
isSign: false, isSign: false,
navs: [ navs: [
{ {
text: '积福气', text: '积福气',
id: 'lucky-value' id: 'lucky-value'
}, },
{ {
text: '幸运大抽奖', text: '幸运大抽奖',
id: 'lucky-draw' id: 'lucky-draw'
}, },
{ {
text: '预付定金', text: '预付定金',
id: 'deposit' id: 'deposit'
}, },
{ {
text: '精品特惠', text: '精品特惠',
id: 'best-courses' id: 'best-courses'
}, },
{ {
text: 'AI测试', text: 'AI测试',
id: 'ai-test' id: 'ai-test'
}, },
{ {
text: '大咖直播', text: '大咖直播',
id: 'live' id: 'live'
}, },
], ],
index: 0, index: 0,
userHasError: props.user.hasError, userHasError: props.user.hasError,
isApp: false isApp: false
}
}
componentDidMount() {
this.fetchUserBlessing();
this.setInitialNavActiveStatus()
window.addEventListener('scroll', throttle(this.calcNavActive, 100));
if (is_weixin()) {
wxShare({
title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
link: window.location.href,
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
})
}
// 获取App登录信息
window['loginInfo'] = result => {
this.loginInfo(result)
}
window['getNewData'] = result => {
this.fetchUserBlessing();
}
window['QQWXWBshare'] = result => {
this.handleToAddBlessing(result);
}
} }
}
// 获取app登录数据 componentDidMount() {
loginInfo = (result) => { this.fetchUserBlessing()
this.setState({ this.setInitialNavActiveStatus()
userInfoList: result window.addEventListener('scroll', throttle(this.calcNavActive, 100))
}, () => { if (is_weixin()) {
if(this.state.userInfoList.length){ wxShare({
this.props.startFetchUser() title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
this.appLogin() desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
} link: window.location.href,
}) imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
})
} }
// 保存cookie
appLogin = () => {
let expires = addDays(new Date(), 90)
this.state.userInfoList.map((item, index) => {
Toast.info(item.uid)
cookie.set("token", item.token, {expires, path: '/', domain: '.julyedu.com'});
cookie.set("plat", item.plat, {expires, path: '/', domain: '.julyedu.com'});
cookie.set("uid", item.uid, {expires, path: '/', domain: '.julyedu.com'});
cookie.set("uname", item.uname, {expires, path: '/', domain: '.julyedu.com'});
cookie.set("avatar_file", item.avatar_file, {expires, path: '/', domain: '.julyedu.com'});
});
if (cookie.get("token") && cookie.get("uid")) {
this.fetchUserBlessing();
this.setState({
isApp: true
})
}
this.props.setCurrentUser(this.transformUser(this.state.userInfoList)) // 获取App登录信息
window['loginInfo'] = result => {
this.loginInfo(result)
} }
transformUser = res => {
let payload
res.map((item, index) => {
payload = {
hasError: false,
data: {
username: item.uname,
avatar: item.avatar_file,
token: item.token,
uid: item.uid
},
isFetching: false
}
})
return payload window['getNewData'] = result => {
this.fetchUserBlessing()
} }
window['QQWXWBshare'] = result => {
this.handleToAddBlessing(result)
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)) { // 获取app登录数据
const navsTop = navs.map(item => item.offsetTop) loginInfo = (result) => {
const index = this.getActiveIndex(navsTop, window.pageYOffset) this.setState({
this.setState({index, navsTop}, () => { userInfoList: result
this.calcNavActive() }, () => {
observer.disconnect() if (this.state.userInfoList.length) {
}) this.props.startFetchUser()
} this.appLogin()
}, 30)) }
observer.observe(document.querySelector('#blessing-preheat'), {childList: true, subtree: true}) })
}
// 保存cookie
appLogin = () => {
let expires = addDays(new Date(), 90)
this.state.userInfoList.map((item, index) => {
Toast.info(item.uid)
cookie.set("token", item.token, {expires, path: '/', domain: '.julyedu.com'})
cookie.set("plat", item.plat, {expires, path: '/', domain: '.julyedu.com'})
cookie.set("uid", item.uid, {expires, path: '/', domain: '.julyedu.com'})
cookie.set("uname", item.uname, {expires, path: '/', domain: '.julyedu.com'})
cookie.set("avatar_file", item.avatar_file, {expires, path: '/', domain: '.julyedu.com'})
})
if (cookie.get("token") && cookie.get("uid")) {
this.fetchUserBlessing()
this.setState({
isApp: true
})
} }
initNav = (isFormal) => { this.props.setCurrentUser(this.transformUser(this.state.userInfoList))
const {navs} = this.state }
if (isFormal) { transformUser = res => {
this.setState({ let payload
navs: navs.filter(item => item.id !== 'deposit')
}) res.map((item, index) => {
payload = {
hasError: false,
data: {
username: item.uname,
avatar: item.avatar_file,
token: item.token,
uid: item.uid
},
isFetching: false
}
})
return payload
}
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
fetchMoudleId = (str) => { }
const {navs} = this.state
return findIndex(navs, item => item.id === str) setInitialNavActiveStatus = () => {
} const observer = new MutationObserver(debounce((list, observer) => {
const navs = this.state.navs.map(item => document.querySelector(`#${item.id}`))
fetchUserBlessing() { if (navs.every(item => item)) {
const {userInfo} = this.state; const navsTop = navs.map(item => item.offsetTop)
http.get(`${API.home}/sys/user/blessing`).then(res => { const index = this.getActiveIndex(navsTop, window.pageYOffset)
const {code, data} = res.data this.setState({index, navsTop}, () => {
alert(code) this.calcNavActive()
if (code === 200) { observer.disconnect()
this.setState({
isSign: !!data.today_signed,
isFormal: data.is_activity,
userInfo: Object.assign({}, userInfo, {
blessingVal: data.user_blessing_value,
buyBlessing: (data.types_total_blessing_value && data.types_total_blessing_value.buy_course) ? data.types_total_blessing_value.buy_course : 0,
inviteBlessing: (data.types_total_blessing_value && data.types_total_blessing_value.invite) ? data.types_total_blessing_value.invite : 0,
})
})
alert(cookie.get('uid'))
if (data.is_login === 1) {
this.handleToSign()
}
this.initNav(data.is_activity)
}
}) })
}
}, 30))
observer.observe(document.querySelector('#blessing-preheat'), {childList: true, subtree: true})
}
initNav = (isFormal) => {
const {navs} = this.state
if (isFormal) {
this.setState({
navs: navs.filter(item => item.id !== 'deposit')
})
} }
}
handleToAddBlessing = (key) => { fetchMoudleId = (str) => {
http.post(`${API.home}/sys/add/blessing`, { const {navs} = this.state
share_platform: key, // 1 朋友圈 2 微博 3 qq return findIndex(navs, item => item.id === str)
type: 3 // 1：签到；3：分享；4：浏览课程； }
}).then(res => {
const {code } = res.data; fetchUserBlessing = () => {
if (code === 200) { const {userInfo} = this.state
Toast.info('+2点福气值~', 2, null, false); http.get(`${API.home}/sys/user/blessing`).then(res => {
} const {code, data} = res.data
}); alert(code)
} if (code === 200) {
this.setState({
isSign: !!data.today_signed,
handleToSign = () => { isFormal: data.is_activity,
http.post(`${API.home}/sys/add/blessing`, { userInfo: Object.assign({}, userInfo, {
type: 1 // 1：签到；3：分享；4：浏览课程； blessingVal: data.user_blessing_value,
}).then(res => { buyBlessing: (data.types_total_blessing_value && data.types_total_blessing_value.buy_course) ? data.types_total_blessing_value.buy_course : 0,
const {code} = res.data inviteBlessing: (data.types_total_blessing_value && data.types_total_blessing_value.invite) ? data.types_total_blessing_value.invite : 0,
if (code === 200) { })
this.setState({
isSign: true,
})
Toast.info('+5点福气值~', 2, null, false)
}
}) })
} alert(cookie.get('uid'))
if (data.is_login === 1) {
handleToHide = (key) => { this.handleToSign()
let obj = {} }
obj[key] = false this.initNav(data.is_activity)
}
})
}
handleToAddBlessing = (key) => {
http.post(`${API.home}/sys/add/blessing`, {
share_platform: key, // 1 朋友圈 2 微博 3 qq
type: 3 // 1：签到；3：分享；4：浏览课程；
}).then(res => {
const {code} = res.data
if (code === 200) {
Toast.info('+2点福气值~', 2, null, false)
}
})
}
handleToSign = () => {
http.post(`${API.home}/sys/add/blessing`, {
type: 1 // 1：签到；3：分享；4：浏览课程；
}).then(res => {
const {code} = res.data
if (code === 200) {
this.setState({ this.setState({
...obj isSign: true,
}) })
Toast.info('+5点福气值~', 2, null, false)
}
})
}
handleToHide = (key) => {
let obj = {}
obj[key] = false
this.setState({
...obj
})
}
handleToShow = (key, isLogin = false) => {
// 需要用户登录 并且用户未登录
const isLoginnew = !this.props.user.hasError
if (isLogin && !isLoginnew) {
this.toLogin()
} else {
let obj = {}
obj[key] = true
this.setState({
...obj
})
} }
}
handleToShow = (key, isLogin = false) => {
// 需要用户登录 并且用户未登录 // 邀请好友注册
const isLoginnew = !this.props.user.hasError handleToShowInvite = () => {
const isLogin = !this.props.user.hasError
if (isLogin && !isLoginnew) { if (isLogin) {
this.toLogin() if (!getParam('version')) {
} else { QRCode.toDataURL(`${API.m}/invite`, {
let obj = {} width: 120,
obj[key] = true height: 120,
this.setState({ margin: 1
...obj })
.then(url => {
const content = (
<>
<img src={url} alt="barcode" className="qr-code"/>
<CopyToClipboard text={`${API.m}/invite"`} onCopy={this.onCopy}>
<button>一键复制网址</button>
</CopyToClipboard>
</>
)
Popup({
title: '扫码邀请好友注册+10点福气值',
content,
className: 'invite-popup'
}) })
})
.catch(err => {
console.error(err)
})
} else {
let data = {
title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
link: 'https://m.julyedu.com/blessingPreheat',
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
} }
SendMessageToApp("toShare", data)
}
} else {
this.toLogin()
} }
}
// 邀请好友注册
handleToShowInvite = () => { handleToShowNotice = () => {
const isLogin = !this.props.user.hasError http.get(`${API['base-api']}/sys/activity/create_blessing_qrcode`).then(res => {
if (isLogin) { const {errno, data} = res.data
if (!getParam('version')) { if (errno === 200) {
QRCode.toDataURL(`${API.m}/invite`, { QRCode.toDataURL(data.url, {
width: 120, width: 120,
height: 120, height: 120,
margin: 1 margin: 1
}) }).then(url => {
.then(url => { Popup({
this.setState({ title: '',
inviteUrl: url, content: <img src={url} alt="barcode" className="qr-code"/>,
inviteVisible: true className: 'invite-popup'
}) })
})
.catch(err => {
console.error(err)
})
} else {
let data = {
title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
link: 'https://m.julyedu.com/blessingPreheat',
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
}
SendMessageToApp("toShare", data)
}
} else {
this.toLogin();
}
}
handleToShowNotice = () => {
http.get(`${API['base-api']}/sys/activity/create_blessing_qrcode`).then(res => {
const {errno, data} = res.data
if (errno === 200) {
QRCode.toDataURL(data.url, {
width: 120,
height: 120,
margin: 1
}).then(url => {
this.setState({
isServer: true,
serverUrl: url,
})
})
.catch(err => {
console.error(err)
})
} else if (errno === 4030 || errno === 4040) {
this.toLogin()
}
}) })
.catch(err => {
console.error(err)
})
} else if (errno === 4030 || errno === 4040) {
this.toLogin()
}
})
}
toLogin = () => {
const {history} = this.props
if (!getParam('version')) {
history.push('/passport')
} else {
SendMessageToApp("toLogin")
} }
}
toLogin = () => {
const {history} = this.props onCopy = () => {
if (!getParam('version')) { Toast.info('复制成功', 2, null, false)
history.push('/passport') }
} else {
SendMessageToApp("toLogin") toSection = (i, e) => {
} 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 = () => {
const {navs, index} = this.state
const y = window.scrollY
let swipeDirection = y > this.prevY ? 'up' : 'down'
let _index
if (swipeDirection === 'up') {
_index = (index + 1) >= navs.length ? index : index + 1
} else {
_index = (index - 1) <= 0 ? 0 : index - 1
} }
let el = document.querySelector(`#${navs[_index].id}`)
onCopy = () => { let nav = document.querySelector('#main-nav')
Toast.info('复制成功', 2, null, false) if (el) {
}
let top = el.offsetTop
toSection = (i, e) => {
const {navs} = this.state if (y <= this.navTop) {
e.preventDefault() nav.classList.remove('fixed')
let top = document.querySelector(`#${navs[i].id}`).offsetTop } else {
this.setState({ !nav.classList.contains('fixed') && nav.classList.add('fixed')
index: i }
})
window.scrollTo({ if (swipeDirection === 'up') {
top: top - 60, if (y + 30 + 30 >= top) {
left: 0 this.setState({
}) index: _index
})
}
} else {
if (y + 30 + 20 <= top) {
this.setState({
index: _index
})
}
}
this.prevY = y
} }
}
render() {
const {
navs,
userInfo,
isRule,
isCourse,
isFormal,
isSign,
showRecordList,
shareMark,
index,
isApp
} = this.state
const {history} = this.props
const isLogin = !this.props.user.hasError
return (
<div id={'blessing-preheat'}>
<Banner
isFormal={isFormal}
navs={navs}
toSection={this.toSection}
index={index}
/>
{/* 积福气 */}
<ListHeader id={'lucky-value'} text="积福气，享受更多福利" styles={{margin: '60px 0 15px'}}/>
<Link className="luck-draw__button" to="/blessingRank">福气排行榜></Link>
<CollectBlessing
isSign={isSign}
userInfo={userInfo}
isLogin={isLogin}
history={this.props.history}
toSection={(e) => this.toSection(this.fetchMoudleId('best-courses'), e)}
handleToShowList={() => this.handleToShow('isCourse')}
handleToShowInvite={this.handleToShowInvite}
handleToShowNotice={this.handleToShowNotice}
handleToShow={this.handleToShow}
toLogin={this.toLogin}
handleToShowShare={() => this.handleToShow('shareMark')}
handleToHideShare={() => this.handleToHide('shareMark')}
/>
{/* 幸运大抽奖--预热 */}
<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/>
{/*定金--只在预热期间显示*/}
{
isFormal === 0 &&
<>
<ListHeader id={'deposit'} text="预付1元定金，最高可省100元" styles={{margin: '30px 0 15px'}}/>
<ReserveCourse isApp={isApp}/>
</>
}
calcNavActive = () => { {/* 精品课程特惠专区 */}
const {navs, index} = this.state <ListHeader id={'best-courses'} text="精品课程特惠专区" styles={{margin: '30px 0 15px'}}/>
const y = window.scrollY <CourseList
let swipeDirection = y > this.prevY ? 'up' : 'down' isApp={isApp}
let _index isFormal={isFormal}
if (swipeDirection === 'up') { isLogin={isLogin}
_index = (index + 1) >= navs.length ? index : index + 1 history={this.props.history}
toLogin={this.toLogin}
} else { />
_index = (index - 1) <= 0 ? 0 : index - 1
{
isRule &&
<RulePopup handleToHide={() => this.handleToHide('isRule')}/>
} }
let el = document.querySelector(`#${navs[_index].id}`) {
let nav = document.querySelector('#main-nav') isCourse &&
if (el) { <CoursePopup toLogin={this.toLogin} history={history} isLogin={isLogin}
handleToHide={() => this.handleToHide('isCourse')}/>
let top = el.offsetTop
if (y <= this.navTop) {
nav.classList.remove('fixed')
} else {
!nav.classList.contains('fixed') && nav.classList.add('fixed')
}
if (swipeDirection === 'up') {
if (y + 30 + 30 >= top) {
this.setState({
index: _index
})
}
} else {
if (y + 30 + 20 <= top) {
this.setState({
index: _index
})
}
}
this.prevY = y
} }
} {
showRecordList &&
<RecordPopup handleToHide={() => this.handleToHide('showRecordList')}/>
}
{
shareMark &&
<SharePopup/>
}
{/*
render() {
const {
navs,
userInfo,
isRule,
isCourse,
inviteUrl,
inviteVisible,
isFormal,
isServer,
serverUrl,
isSign,
showRecordList,
shareMark,
index,
isApp
} = this.state;
const {history} = this.props;
const isLogin = !this.props.user.hasError
return (
<div id={'blessing-preheat'}>
<Banner
isFormal={isFormal}
navs={navs}
toSection={this.toSection}
index={index}
/>
{/* 积福气 */}
<ListHeader id={'lucky-value'} text="积福气，享受更多福利" styles={{margin: '60px 0 15px'}}/>
<Link className="luck-draw__button" to="/blessingRank">福气排行榜></Link>
<CollectBlessing
isSign={isSign}
userInfo={userInfo}
isLogin={isLogin}
history={this.props.history}
toSection={(e) => this.toSection(this.fetchMoudleId('best-courses'), e)}
handleToShowList={() => this.handleToShow('isCourse')}
handleToShowInvite={this.handleToShowInvite}
handleToShowNotice={this.handleToShowNotice}
handleToShow={this.handleToShow}
toLogin={this.toLogin}
handleToShowShare={() => this.handleToShow('shareMark')}
handleToHideShare={() => this.handleToHide('shareMark')}
/>
{/* 幸运大抽奖--预热 */}
<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/>
{/*定金--只在预热期间显示*/}
{
isFormal === 0 &&
<>
<ListHeader id={'deposit'} text="预付1元定金，最高可省100元" styles={{margin: '30px 0 15px'}}/>
<ReserveCourse isApp={isApp}/>
</>
}
{/* 精品课程特惠专区 */}
<ListHeader id={'best-courses'} text="精品课程特惠专区" styles={{margin: '30px 0 15px'}}/>
<CourseList
isApp={isApp}
isFormal={isFormal}
isLogin={isLogin}
history={this.props.history}
toLogin={this.toLogin}
/>
{
isRule &&
<RulePopup handleToHide={() => this.handleToHide('isRule')}/>
}
{
isCourse &&
<CoursePopup toLogin={this.toLogin} history={history} isLogin={isLogin}
handleToHide={() => this.handleToHide('isCourse')}/>
}
{
showRecordList &&
<RecordPopup handleToHide={() => this.handleToHide('showRecordList')}/>
}
{
shareMark &&
<SharePopup/>
}
<Popup
visible={inviteVisible}
title={'扫码邀请好友注册+10点福气值'}
className={'invite-popup'}
>
<img src={inviteUrl} alt="barcode" className="qr-code"/>
<CopyToClipboard text={`${API.m}/invite"`} onCopy={this.onCopy}>
<button>一键复制网址</button>
</CopyToClipboard>
</Popup>
<Popup
visible={isServer}
title="扫码关注“七月在线”服务号"
className={'invite-popup'}
>
<img src={serverUrl} alt="barcode" className="qr-code"/>
</Popup>
<Popup visible={this.state.joinLotteryVisible} <Popup visible={this.state.joinLotteryVisible}
title={'你已成功参与本时段抽奖'} title={'你已成功参与本时段抽奖'}
...@@ -541,28 +531,28 @@ class BlessingPreheat extends Component { ...@@ -541,28 +531,28 @@ class BlessingPreheat extends Component {
> >
<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/tinypng-common/right_weixin.png" alt="" <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/tinypng-common/right_weixin.png" alt=""
className="qr-code"/> className="qr-code"/>
</Popup> </Popup>*/}
<ListHeader id={'ai-test'} text="全国AI工程师水平测试" styles={{margin: '30px 0 15px'}}/> <ListHeader id={'ai-test'} text="全国AI工程师水平测试" styles={{margin: '30px 0 15px'}}/>
<div className="test__record" onClick={() => this.handleToShow('showRecordList', true)}> <div className="test__record" onClick={() => this.handleToShow('showRecordList', true)}>
测试记录> 测试记录>
</div> </div>
<LevelTest history={history} isLogin={isLogin} toLogin={this.toLogin}></LevelTest> <LevelTest history={history} isLogin={isLogin} toLogin={this.toLogin}></LevelTest>
<RankList></RankList> <RankList></RankList>
<Live isFormal={isFormal}></Live> <Live isFormal={isFormal}></Live>
</div> </div>
) )
} }
} }
export default compose( export default compose(
connect( connect(
state => ({user: state.user}), state => ({user: state.user}),
{setCurrentUser, startFetchUser} {setCurrentUser, startFetchUser}
) )
)(BlessingPreheat) )(BlessingPreheat)
\ No newline at end of file
src/components/blessingPreheat/live/index.js
...@@ -16,8 +16,6 @@ class Live extends Component { ...@@ -16,8 +16,6 @@ class Live extends Component {
tabs: [], tabs: [],
lives: {}, lives: {},
preheatLives: [], preheatLives: [],
visible: false,
qrcode: '',
today: '', today: '',
isApp: getParam('version') isApp: getParam('version')
} }
...@@ -80,9 +78,9 @@ class Live extends Component { ...@@ -80,9 +78,9 @@ class Live extends Component {
const {data} = res const {data} = res
if (data.code == 200) { if (data.code == 200) {
QRCode.toDataURL(data.data.url, (err, url) => { QRCode.toDataURL(data.data.url, (err, url) => {
this.setState({ Popup({
qrcode: url, title: '扫码关注“七月在线”服务号即可预约',
visible: true content: <img id={'live-qr-code'} src={url} alt=""/>
}) })
}) })
} else { } else {
...@@ -92,14 +90,9 @@ class Live extends Component { ...@@ -92,14 +90,9 @@ class Live extends Component {
} }
render() { render() {
const {tabs, lives, visible, qrcode, preheatLives, today} = this.state const {tabs, lives, preheatLives, today} = this.state
return ( return (
<div id={'live'}> <div id={'live'}>
<Popup title={'扫码关注“七月在线”服务号即可预约'}
visible={visible}
>
<img id={'live-qr-code'} src={qrcode} alt=""/>
</Popup>
<div className="title"> <div className="title">
<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/title-decorate-left.png" alt=""/> <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/title-decorate-left.png" alt=""/>
<span>大咖直播</span> <span>大咖直播</span>
......
src/components/blessingPreheat/live/index.scss
#live { #live {
margin-top: 30px; margin-top: 30px;
.title { .title {
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -175,22 +176,6 @@ ...@@ -175,22 +176,6 @@
} }
.popup-container {
.title {
color: #525C65;
}
.content {
display: flex;
justify-content: center;
img {
width: 120px;
height: 120px;
}
}
}
.am-tabs { .am-tabs {
width: 330px; width: 330px;
margin: 0 auto; margin: 0 auto;
...@@ -234,3 +219,20 @@ ...@@ -234,3 +219,20 @@
} }
} }
.popup-container {
.title {
color: #525C65;
}
.content {
display: flex;
justify-content: center;
img {
width: 120px;
height: 120px;
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment