Skip to content

M
mr-julyedu
Commit 987e5388 by FE
Options

del build again

parents 14232aad c087d8df
Showing with 270 additions and 160 deletions
src/App.js
...@@ -3,7 +3,7 @@ import Routes from './router' ...@@ -3,7 +3,7 @@ import Routes from './router'
import cookie from 'js-cookie' import cookie from 'js-cookie'
import { connect } from "react-redux" import { connect } from "react-redux"
import { setCurrentUser, startFetchUser } from "@/store/userAction" import { setCurrentUser, startFetchUser } from "@/store/userAction"
import {initialState} from "@/store/userReducer" import { initialState } from "@/store/userReducer"
import { withRouter, Link } from 'react-router-dom' import { withRouter, Link } from 'react-router-dom'
import { compose } from 'redux' import { compose } from 'redux'
import { getParam, http, browser } from "@/utils" import { getParam, http, browser } from "@/utils"
...@@ -34,18 +34,22 @@ class App extends Component { ...@@ -34,18 +34,22 @@ class App extends Component {
pathnameBlacklist = ['/country', '/passport'] pathnameBlacklist = ['/country', '/passport']
firstLoad = true firstLoad = true
componentWillMount(){
componentWillMount() {
if (!getParam('version')) { if (!getParam('version')) {
if(!cookie.get('qimoClientIdedu')){ if (!cookie.get('qimoClientIdedu')) {
this.getqimoClientId() this.getqimoClientId()
} else { } else {
window.qimoClientId = cookie.get('qimoClientIdedu')} window.qimoClientId = cookie.get('qimoClientIdedu')
}
} }
} }
componentDidMount() { componentDidMount() {
this.umengStatistic() this.umengStatistic()
//平台信息 //平台信息
cookie.set('plat', '5', {domain: '.julyedu.com'}) !getParam('version') && cookie.set('plat', '5', {domain: '.julyedu.com'})
if (browser.isWeixin && browser.isIOS) { if (browser.isWeixin && browser.isIOS) {
sessionStorage.setItem('enter_url', window.location.href) sessionStorage.setItem('enter_url', window.location.href)
...@@ -285,19 +289,19 @@ class App extends Component { ...@@ -285,19 +289,19 @@ class App extends Component {
// 七陌客服代码 start // 七陌客服代码 start
getqimoClientId =()=>{ getqimoClientId = () => {
http.post(`${API['home']}/qiMoUserId`) http.post(`${API['home']}/qiMoUserId`)
.then(res => { .then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
window.qimoClientId = res.data.data.userId window.qimoClientId = res.data.data.userId
cookie.set('qimoClientIdedu', res.data.data.userId, {domain: '.julyedu.com'}) cookie.set('qimoClientIdedu', res.data.data.userId, {domain: '.julyedu.com'})
} }
}) })
.catch(function () { .catch(function () {
}) })
} }
QimoClient=()=>{ QimoClient = () => {
let utm_source = getParam('utm_source') let utm_source = getParam('utm_source')
let utm_medium = getParam('utm_medium') let utm_medium = getParam('utm_medium')
let utm_campaign = getParam('utm_campaign') let utm_campaign = getParam('utm_campaign')
...@@ -307,10 +311,10 @@ class App extends Component { ...@@ -307,10 +311,10 @@ class App extends Component {
var src = '' var src = ''
// 知乎投放 // 知乎投放
if (utm_term && utm_source && utm_medium && utm_campaign && utm_content) { if (utm_term && utm_source && utm_medium && utm_campaign && utm_content) {
src = 'https://webchat.7moor.com/javascripts/7moorInit.js?accessId=e2ca4f90-2d04-11ea-84c3-43908ae47640&autoShow=true&language=ZHCN' src = 'https://webchat.7moor.com/javascripts/7moorInit.js?accessId=e2ca4f90-2d04-11ea-84c3-43908ae47640&autoShow=false&language=ZHCN'
} else { } else {
// m端 // m端
src = 'https://webchat.7moor.com/javascripts/7moorInit.js?accessId=fbcf9aa0-2d03-11ea-84c3-43908ae47640&autoShow=true&language=ZHCN' src = 'https://webchat.7moor.com/javascripts/7moorInit.js?accessId=fbcf9aa0-2d03-11ea-84c3-43908ae47640&autoShow=false&language=ZHCN'
} }
var script = document.createElement('script') var script = document.createElement('script')
...@@ -320,12 +324,17 @@ class App extends Component { ...@@ -320,12 +324,17 @@ class App extends Component {
document.body.appendChild(script) document.body.appendChild(script)
} }
// 七陌客服代码 end
// 七陌客服代码 end
render() { render() {
return <Routes/> return <>
<Routes/>
{/*<Link className={'year19-index'} to="/year/yearindex">*/}
{/*<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/PC/pc-yearindex.png" alt=""/>*/}
{/*</Link>*/}
</>
} }
} }
......
src/assets/css/index.scss
...@@ -512,3 +512,18 @@ input[type="radio"]:checked:before { ...@@ -512,3 +512,18 @@ input[type="radio"]:checked:before {
color: #333; color: #333;
font-size: 15px; font-size: 15px;
} }
.year19-index {
display: block;
width: 58px;
height: 70px;
position: fixed;
top: 50%;
right: 0;
margin-top: -35px;
z-index: 9;
img {
width: 100%;
height: 100%;
}
}
\ No newline at end of file
src/components/activity/newyear-2019/common/prizes/index.js
...@@ -114,7 +114,7 @@ class Prizes extends Component { ...@@ -114,7 +114,7 @@ class Prizes extends Component {
item.grant_max item.grant_max
? ?
<div className='bottom-bar'> <div className='bottom-bar'>
<div className="progress-bar"><span className={'progress'}/></div> <div className="progress-bar"><span className={'progress'} style={{width: `${(item.surplus / item.grant_max) * 100}%`}}/></div>
<span>限量{item.grant_max}份</span> <span>限量{item.grant_max}份</span>
</div> </div>
: <span className='no-limit'>不限量</span> : <span className='no-limit'>不限量</span>
......
src/components/activity/newyear-2019/common/prizes/prizes.scss
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
width: 80%; //width: 80%;
height: 100%; height: 100%;
background: linear-gradient(-90deg, rgba(255, 140, 0, 1) 0%, rgba(255, 23, 0, 1) 100%); background: linear-gradient(-90deg, rgba(255, 140, 0, 1) 0%, rgba(255, 23, 0, 1) 100%);
border-radius: 1px; border-radius: 1px;
......
src/components/activity/newyear-2019/landing/index.js
...@@ -41,7 +41,7 @@ class Landing extends Component { ...@@ -41,7 +41,7 @@ class Landing extends Component {
this.getStage(); this.getStage();
this.fetchPageData() this.fetchPageData()
window.showFollowAlert = this.remind.bind(this, 'create') window.showFollowAlert = this.remind.bind(this, 'create')
document.title = '七月在线年终大回馈，幸运宝箱随你开，100%有奖！' document.title = '七月在线新春献礼，幸运宝箱随你开，100%有奖！“薪”年好课免费学，精品课程1分秒！'
const landing = document.querySelector('#landing') const landing = document.querySelector('#landing')
const boxContainer = document.querySelector('.box-container') const boxContainer = document.querySelector('.box-container')
if (boxContainer.offsetHeight < window.innerHeight) { if (boxContainer.offsetHeight < window.innerHeight) {
......
src/components/activity/newyear-2019/myTreasure/index.js
...@@ -43,7 +43,7 @@ class MyTreasure extends Component { ...@@ -43,7 +43,7 @@ class MyTreasure extends Component {
componentDidMount() { componentDidMount() {
this.fetchMyTreasure() this.fetchMyTreasure()
this.fetchActivityStatus() this.fetchActivityStatus()
document.title = '七月在线年终大回馈，幸运宝箱随你开，100%有奖！人气好课免费学，精品课程1分抢！'; document.title = '七月在线新春献礼，幸运宝箱随你开，100%有奖！“薪”年好课免费学，精品课程1分秒！';
} }
componentWillReceiveProps(nextProp) { componentWillReceiveProps(nextProp) {
......
src/components/activity/newyear-2019/preheat/LiveRoom/index.js
...@@ -141,7 +141,7 @@ class LiveRoom extends Component { ...@@ -141,7 +141,7 @@ class LiveRoom extends Component {
) )
} }
<CommonContainer title='大咖直播' id="year-live"> <CommonContainer title='“薪”年好课免费学' id="year-live">
<ul className='live__list'> <ul className='live__list'>
{ {
list.length && ( list.length && (
...@@ -153,39 +153,39 @@ class LiveRoom extends Component { ...@@ -153,39 +153,39 @@ class LiveRoom extends Component {
<span>主题：</span> <span>主题：</span>
<p>{item.title}</p> <p>{item.title}</p>
</div> </div>
<div className="info__item"> {/*<div className="info__item">*/}
<span>时间：</span> {/*<span>时间：</span>*/}
<p>{item.date}</p> {/*<p>{item.date}</p>*/}
</div> {/*</div>*/}
<div className="info__item"> <div className="info__item">
<span>讲师：</span> <span>讲师：</span>
<p>{item.teacher}</p> <p>{item.teacher}</p>
</div> </div>
{ {/*{*/}
item.on_live == 0 && item.is_end == 0 && item.is_subscribe == 0 && ( {/*item.on_live == 0 && item.is_end == 0 && item.is_subscribe == 0 && (*/}
<span onClick={ ()=>this.subscribe(item.live_id)} className="order__btn">立即预约</span> {/*<span onClick={ ()=>this.subscribe(item.live_id)} className="order__btn">立即预约</span>*/}
) {/*)*/}
} {/*}*/}
{ {/*{*/}
item.is_end == 1 && item.transcribe_url=='' && ( {/*item.is_end == 1 && item.transcribe_url=='' && (*/}
<span className="order__btn live__end">已结束</span> {/*<span className="order__btn live__end">已结束</span>*/}
) {/*)*/}
} {/*}*/}
{/*{*/}
{/*item.on_live == 0 && item.is_end == 0 && item.is_subscribe == 1 && (*/}
{/*<span onClick={this.tip} className="order__btn subscribed">已预约</span>*/}
{/*)*/}
{/*}*/}
{/*{*/}
{/*item.on_live == 1 && item.is_end == 0 && (*/}
{/*<span onClick={()=>this.toLivingRoom(item.room_url)} className="order__btn living">正在直播</span>*/}
{/*)*/}
{/*}*/}
{ {
item.on_live == 0 && item.is_end == 0 && item.is_subscribe == 1 && ( item.transcribe_url != '' && (
<span onClick={this.tip} className="order__btn subscribed">已预约</span> <span onClick={() => this.checkVideo(item.transcribe_url)} className="order__btn check__video">点击查看</span>
)
}
{
item.on_live == 1 && item.is_end == 0 && (
<span onClick={()=>this.toLivingRoom(item.room_url)} className="order__btn living">正在直播</span>
)
}
{
item.is_end == 1 && item.transcribe_url != '' && (
<span onClick={() => this.checkVideo(item.transcribe_url)} className="order__btn check__video">查看回放</span>
) )
} }
......
src/components/activity/newyear-2019/preheat/YearCourse/index.js
...@@ -75,7 +75,7 @@ class YearCourse extends Component { ...@@ -75,7 +75,7 @@ class YearCourse extends Component {
this.getTeamInfo() this.getTeamInfo()
this.getLength() this.getLength()
this.fetchBigCourse() this.fetchBigCourse()
this.fetchFreeCourse() // this.fetchFreeCourse()
this.fetchGroupCourse() this.fetchGroupCourse()
// AI之路-基础 // AI之路-基础
this.fetchAICourse('one', false) this.fetchAICourse('one', false)
...@@ -92,7 +92,7 @@ class YearCourse extends Component { ...@@ -92,7 +92,7 @@ class YearCourse extends Component {
this.getTeamInfo() this.getTeamInfo()
this.getLength() this.getLength()
this.fetchBigCourse() this.fetchBigCourse()
this.fetchFreeCourse() // this.fetchFreeCourse()
this.fetchGroupCourse() this.fetchGroupCourse()
// AI之路-基础 // AI之路-基础
this.fetchAICourse('one') this.fetchAICourse('one')
...@@ -221,7 +221,7 @@ class YearCourse extends Component { ...@@ -221,7 +221,7 @@ class YearCourse extends Component {
toQQque = () => { toQQque = () => {
if (!getParam('version')) { if (!getParam('version')) {
location.href = 'https://q.url.cn/AB8aue?_type=wpa&qidian=true' qimoChatClick()
} else { } else {
SendMessageToApp("toQQ", 'https://q.url.cn/AB8aue?_type=wpa&qidian=true') SendMessageToApp("toQQ", 'https://q.url.cn/AB8aue?_type=wpa&qidian=true')
} }
...@@ -610,44 +610,81 @@ class YearCourse extends Component { ...@@ -610,44 +610,81 @@ class YearCourse extends Component {
<div className={'year-index-course'}> <div className={'year-index-course'}>
{/*浮框*/} {/*浮框*/}
{ {/*{*/}
Number(treasureStage) === 1 && {/*Number(treasureStage) === 1 &&*/}
<div className='nav-right'> {/*<div className='nav-right'>*/}
<span onClick={this.toBoxList} className='nav-right__link'> {/*<span onClick={this.toBoxList} className='nav-right__link'>*/}
未开宝箱 {/*未开宝箱*/}
{ {/*{*/}
removable > 0 && {/*removable > 0 &&*/}
<i className="nav-right__number">{removable}</i> {/*<i className="nav-right__number">{removable}</i>*/}
} {/*}*/}
</span> {/*</span>*/}
<a onClick={() => this.toYearWish()} className='nav-right__link'> {/*<a onClick={() => this.toYearWish()} className='nav-right__link'>*/}
心愿单 {/*心愿单*/}
{ {/*{*/}
sum > 0 && {/*sum > 0 &&*/}
<i className="nav-right__number">{sum}</i> {/*<i className="nav-right__number">{sum}</i>*/}
} {/*}*/}
</a> {/*</a>*/}
</div> {/*</div>*/}
} {/*}*/}
{ {/*{*/}
Number(treasureStage) === 0 && {/*Number(treasureStage) === 0 &&*/}
<div className='nav-right-wish nav-right'> {/*<div className='nav-right-wish nav-right'>*/}
<a onClick={() => this.toYearWish()} className='nav-right__link'> {/*<a onClick={() => this.toYearWish()} className='nav-right__link'>*/}
心愿单 {/*心愿单*/}
{ {/*{*/}
sum > 0 && {/*sum > 0 &&*/}
<i className="nav-right__number">{sum}</i> {/*<i className="nav-right__number">{sum}</i>*/}
} {/*}*/}
</a> {/*</a>*/}
</div> {/*</div>*/}
} {/*}*/}
<div className='nav-right-wish nav-right'>
<span onClick={this.toBoxList} className='nav-right__link'>未开宝箱
{
removable > 0 &&
<i className="nav-right__number">{removable}</i>
}
</span>
</div>
<CommonContainer title='驰援武汉 注册即送' id='year-wuhan'>
<div className="course-box course-conter">
<div className="course-item">
<span>注册即送</span>
<a href="/detail?id=224">
<img
src="http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/75d1c3cef5.png"
alt=""/>
</a>
</div>
<div className="course-item">
<span>注册即送</span>
<a href="/detail?id=206">
<img
src="https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/b001fac23f.png"
alt=""/>
</a>
</div>
<div className="course-item">
<span>注册即送</span>
<a href="/detail?id=230">
<img
src="https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/d0fb0a479b.png"
alt=""/>
</a>
</div>
</div>
</CommonContainer>
{/* 重磅好课 */} {/* 重磅好课 */}
<CommonContainer title='重磅好课' id='year-course'> <CommonContainer title='重磅好课限时免费试听' id='year-course'>
{ {
(bigcourse.course && bigcourse.course.length > 0) && (bigcourse.course && bigcourse.course.length > 0) &&
<> <>
...@@ -662,18 +699,30 @@ class YearCourse extends Component { ...@@ -662,18 +699,30 @@ class YearCourse extends Component {
> >
<div className="coupon-course__footer"> <div className="coupon-course__footer">
{ {
item.is_buy == 1 && item.is_vip == 1 &&
<a <a className="btn big-course" onClick={() => this.toQQque()}>
onClick={() => this.toCourse(item.course_id)} 首购¥99起
className="btn to-study" </a>
>开始学习</a>
} }
{ {
item.is_buy == 0 && item.is_vip == 0 &&
<a <>
onClick={() => this.toQQque()} {
className="btn big-course" item.is_buy == 1 &&
>免费试听</a> <a
onClick={() => this.toCourse(item.course_id)}
className="btn to-study"
>开始学习</a>
}
{
item.is_buy == 0 &&
<a
onClick={() => this.toQQque()}
className="btn big-course"
>{item.is_audition == 1 ? '免费试听': '抢团报名额'}</a>
}
</>
} }
</div> </div>
</CourseItem> </CourseItem>
...@@ -692,63 +741,63 @@ class YearCourse extends Component { ...@@ -692,63 +741,63 @@ class YearCourse extends Component {
</CommonContainer> </CommonContainer>
{/* 人气好课免费学 */} {/* 人气好课免费学 */}
{ {/*{*/}
Number(stage) !== 3 && {/*Number(stage) !== 3 &&*/}
<CommonContainer title='人气好课免费学' id='year-free'> {/*<CommonContainer title='人气好课免费学' id='year-free'>*/}
<a className='boss__add' href="/active/givecourse?activename=shuangdan">更有42本技术书籍免费送</a> {/*<a className='boss__add' href="/active/givecourse?activename=shuangdan">更有42本技术书籍免费送</a>*/}
{ {/*{*/}
(freecourse.course && freecourse.course.length > 0) && {/*(freecourse.course && freecourse.course.length > 0) &&*/}
<> {/*<>*/}
<div className='freecourse course-box'> {/*<div className='freecourse course-box'>*/}
{ {/*{*/}
freecourse.course.map(item => ( {/*freecourse.course.map(item => (*/}
<CourseItem {/*<CourseItem*/}
image={item.image_name} {/*image={item.image_name}*/}
key={item.course_id} {/*key={item.course_id}*/}
id={item.course_id} {/*id={item.course_id}*/}
toCourse={this.toCourse} {/*toCourse={this.toCourse}*/}
> {/*>*/}
<div className="coupon-course__footer"> {/*<div className="coupon-course__footer">*/}
{ {/*{*/}
item.is_buy == 1 && {/*item.is_buy == 1 &&*/}
<a {/*<a*/}
onClick={() => this.toCourse(item.course_id)} {/*onClick={() => this.toCourse(item.course_id)}*/}
className="btn to-study" {/*className="btn to-study"*/}
>开始学习</a> {/*>开始学习</a>*/}
} {/*}*/}
{ {/*{*/}
item.is_buy == 0 && {/*item.is_buy == 0 &&*/}
<a {/*<a*/}
onClick={() => this.freeStudy()} {/*onClick={() => this.freeStudy()}*/}
className="btn free-study" {/*className="btn free-study"*/}
>点击免费学</a> {/*>点击免费学</a>*/}
} {/*}*/}
<p className="free-course-num"> {/*<p className="free-course-num">*/}
已送出<span>{item.act_num}</span>个课程 {/*已送出<span>{item.act_num}</span>个课程*/}
</p> {/*</p>*/}
</div> {/*</div>*/}
</CourseItem> {/*</CourseItem>*/}
)) {/*))*/}
} {/*}*/}
</div> {/*</div>*/}
{ {/*{*/}
(freecourse.courseList && freecourse.courseList.length > 4) && {/*(freecourse.courseList && freecourse.courseList.length > 4) &&*/}
<button {/*<button*/}
className="more-button" {/*className="more-button"*/}
onClick={() => this.handleToMore('freecourse')} {/*onClick={() => this.handleToMore('freecourse')}*/}
>{freecourse.isMore ? '查看更多' : '收起'}</button> {/*>{freecourse.isMore ? '查看更多' : '收起'}</button>*/}
} {/*}*/}
</> {/*</>*/}
} {/*}*/}
</CommonContainer> {/*</CommonContainer>*/}
} {/*}*/}
{/* stage，活动阶段 0-不在活动时间 1-预热 2-正式 3-返场 */} {/* stage，活动阶段 0-不在活动时间 1-预热 2-正式 3-返场 */}
{ {
Number(stage) !== 1 && Number(stage) !== 1 &&
<> <>
{/* 精品好课1分开抢 */} {/* 精品好课1分开抢 */}
<CommonContainer title='精品好课1分开抢' id='year-group'> <CommonContainer title='精品好课1分秒' id='year-group'>
{ {
(groupcourse.course && groupcourse.course.length > 0) && (groupcourse.course && groupcourse.course.length > 0) &&
<> <>
...@@ -850,7 +899,7 @@ class YearCourse extends Component { ...@@ -850,7 +899,7 @@ class YearCourse extends Component {
</CommonContainer> </CommonContainer>
{/* 好课价到，等你抄底 */} {/* 好课价到，等你抄底 */}
<CommonContainer title='好课价到，等你抄底' id='year-discount'> <CommonContainer title='“薪”年价到，等你抄底！' id='year-discount'>
{ {
[1, 2, 3, 4].map(item => { [1, 2, 3, 4].map(item => {
const keys = this.formatTitleAndKey(item); const keys = this.formatTitleAndKey(item);
...@@ -891,7 +940,7 @@ class YearCourse extends Component { ...@@ -891,7 +940,7 @@ class YearCourse extends Component {
<span className="price-label">¥</span> <span className="price-label">¥</span>
<span className="new-price">{val.original_price}</span> <span className="new-price">{val.original_price}</span>
<span className="old-price"> <span className="old-price">
<s>¥{val.original_price}</s> <s>¥{val.price1}</s>
</span> </span>
</div> </div>
</> </>
......
src/components/activity/newyear-2019/preheat/YearCourse/index.scss
...@@ -10,6 +10,36 @@ ...@@ -10,6 +10,36 @@
margin: 12px auto 0; margin: 12px auto 0;
} }
.course-conter {
.course-item {
width: 168px;
padding: 4px;
background-color: #fff;
position: relative;
border-radius: 2px;
span {
position: absolute;
right: 4px;
top: 4px;
width: 60px;
display: block;
text-align: center;
padding-left: 5px;
border-radius: 0 0 0 10px;
background-color: #EB1612;
color: #fff;
font-size: 12px;
}
a {
width: 160px;
height: 104px;
img {
width: 100%;
height: 100%;
}
}
}
}
.course-box { .course-box {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
......
src/components/activity/newyear-2019/preheat/index.js
...@@ -29,7 +29,7 @@ export default class index extends Component { ...@@ -29,7 +29,7 @@ export default class index extends Component {
userInfo: {}, userInfo: {},
isAppUpdate: false, isAppUpdate: false,
showMark: false, showMark: false,
banner: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_banner_bj%402x.png' banner: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/new-year/m-banner.png'
} }
componentDidMount() { componentDidMount() {
...@@ -39,7 +39,7 @@ export default class index extends Component { ...@@ -39,7 +39,7 @@ export default class index extends Component {
_this.loginInfo(result) _this.loginInfo(result)
} }
_this.getStage() _this.getStage()
document.title = '七月在线年终大回馈，幸运宝箱随你开，100%有奖！人气好课免费学，精品课程1分抢！'; document.title = '七月在线新春献礼，幸运宝箱随你开，100%有奖！“薪”年好课免费学，精品课程1分秒！';
} }
// 获取app登录数据 // 获取app登录数据
...@@ -147,7 +147,7 @@ export default class index extends Component { ...@@ -147,7 +147,7 @@ export default class index extends Component {
}) })
} else { } else {
this.setState({ this.setState({
banner: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_banner_bj%402x.png', banner: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/new-year/m-banner.png',
}) })
} }
} else { } else {
......
src/components/activity/newyear-2019/preheat/index.scss
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
} }
.banner-treasure__decorate { .banner-treasure__decorate {
height: 35px; height: 20px;
background-size: cover; //background-size: cover;
background-image: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_nv_bj%402x.png'); //background-image: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_nv_bj%402x.png');
} }
.sub__code_container { .sub__code_container {
......
src/components/activity/newyear-2019/preheat/nav.js
...@@ -13,20 +13,24 @@ class TreasureNav extends Component { ...@@ -13,20 +13,24 @@ class TreasureNav extends Component {
navs: [ navs: [
{ {
id: 'year-live', id: 'year-live',
name: '大咖直播' name: '好课免费学'
}, },
{ {
id: 'year-treasure', id: 'year-treasure',
name: '组队开宝箱' name: '组队开宝箱'
}, },
{ {
id: 'year-course', id: 'year-wuhan',
name: '重磅好课' name: '驰援武汉'
}, },
{ {
id: 'year-free', id: 'year-course',
name: '免费学' name: '重磅好课'
}, },
// {
// id: 'year-free',
// name: '免费学'
// },
{ {
id: 'year-group', id: 'year-group',
name: '1分拼团' name: '1分拼团'
......
src/components/passport/setPassword/index.js
...@@ -69,7 +69,9 @@ const formikConfig = { ...@@ -69,7 +69,9 @@ const formikConfig = {
}, },
handleSubmit: (values, {props}) => { handleSubmit: (values, {props}) => {
let from = props.location.state && props.location.state.from || {pathname: '/'} const {location} = props
let from = location.state && location.state.records && location.state.records[location.state.records.length - 2] || {pathname: '/'}
if (from.pathname.includes('forgot-password')) { if (from.pathname.includes('forgot-password')) {
forgotPasswordReset(values, props) forgotPasswordReset(values, props)
} else { } else {
......
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