Commit c6b3ed05 by FE

Merge branch 'pythonClass' into pre

parents 1dcd5f5c d5076e81
...@@ -8,7 +8,7 @@ export default class Description extends Component { ...@@ -8,7 +8,7 @@ export default class Description extends Component {
<img className={'left'} src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/left.png" alt=""/> <img className={'left'} src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/left.png" alt=""/>
<img className={'right'} src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/right.png" alt=""/> <img className={'right'} src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/right.png" alt=""/>
<p className={'title'}> / / / </p> <p className={'title'}> / / / </p>
<p className={'sub__title'}>对话式交互教学+课后实操,20节课全面掌握Python基础语法</p> <p className={'sub__title'}>对话式交互教学+课后实操,17节课全面掌握Python基础语法</p>
<img src={'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/diannao.png'} /> <img src={'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/diannao.png'} />
{ {
this.props.list.map((item, index)=>{ this.props.list.map((item, index)=>{
......
...@@ -3,18 +3,41 @@ import './index.scss' ...@@ -3,18 +3,41 @@ import './index.scss'
export default class Experience extends Component { export default class Experience extends Component {
render() { render() {
const { isOnline, tryLearn } = this.props;
return ( return (
<div className={'experience_container'}> <div className={'experience_container'}>
<p className={'title'}> / / / </p> <p className={'title'}> / / / </p>
<div className={'experience'}>
<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/L%402x.png" alt=""/> {
<div> isOnline
<p>限时福利免费试学</p> ? (
<p>开始颠覆你想象的学习</p> <>
</div> <div className={'experience'}>
<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/r%402x.png" alt=""/> <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/L%402x.png" alt=""/>
</div> <div>
<div className={'btn'} onClick={this.props.tryLearn}>立即体验</div> <p>限时福利免费试学</p>
<p>开始颠覆你想象的学习</p>
</div>
<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/r%402x.png" alt=""/>
</div>
<div className={'btn'} onClick={tryLearn}>立即体验</div>
</>
)
: (
<>
<div className={'experience'}>
<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/L%402x.png" alt=""/>
<div>
<p>上架后可免费试学</p>
<p>体验颠覆你想象的学习</p>
</div>
<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/r%402x.png" alt=""/>
</div>
<div className={'btn btn--online'}>即将上架敬请期待</div>
</>
)
}
</div> </div>
) )
} }
......
...@@ -31,14 +31,22 @@ ...@@ -31,14 +31,22 @@
.btn { .btn {
width: 150px; width: 150px;
height: 36px; height: 36px;
background: rgba(0, 153, 255, 1); margin: 0 auto;
box-shadow: 0px 6px 12px 0px rgba(0, 153, 255, 0.06);
border-radius: 18px; border-radius: 18px;
font-size: 16px; font-size: 16px;
font-weight: 600; font-weight: 600;
color: rgba(255, 255, 255, 1); color: rgba(255, 255, 255, 1);
line-height: 36px;
text-align: center; text-align: center;
margin: 0 auto; line-height: 36px;
background: rgba(0, 153, 255, 1);
box-shadow: 0px 6px 12px 0px rgba(0, 153, 255, 0.06);
}
.btn--online {
width: 200px;
font-size: 15px;
color: #fff;
letter-spacing: 4px;
background-color: rgba(82,92,101,.6);
} }
} }
...@@ -16,7 +16,7 @@ export default class Progream extends Component { ...@@ -16,7 +16,7 @@ export default class Progream extends Component {
q: '学习过程中遇到了困难怎么办?', q: '学习过程中遇到了困难怎么办?',
a: '我们为学员配备了专门的助教,有问题随时可以咨询助教老师。' a: '我们为学员配备了专门的助教,有问题随时可以咨询助教老师。'
},{ },{
q: '课程学习周期是多久?', q: '需要自己安装代码运行环境吗?',
a: '在平台上学习不需要安装任何环境,该课程包含的知识点实操以及课后实操都可以在平台上完成。' a: '在平台上学习不需要安装任何环境,该课程包含的知识点实操以及课后实操都可以在平台上完成。'
} }
] ]
......
...@@ -29,7 +29,7 @@ export default class Study extends Component { ...@@ -29,7 +29,7 @@ export default class Study extends Component {
<img className={'learn_left'} src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/learn_left.png" alt=""/> <img className={'learn_left'} src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/learn_left.png" alt=""/>
<img className={'learn_bottom'} src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/learn_bottom.png" alt=""/> <img className={'learn_bottom'} src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/learn_bottom.png" alt=""/>
<p className={'title'}> / / / </p> <p className={'title'}> / / / </p>
<p className={'sub__title'}>20节课堂教学,带你掌握Python技术入门知识</p> <p className={'sub__title'}>17节课堂教学,带你掌握Python技术入门知识</p>
<div className={'step__container'}> <div className={'step__container'}>
<div className={'item__container'}> <div className={'item__container'}>
<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/wanzheng.png" alt=""/> <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/wanzheng.png" alt=""/>
......
...@@ -75,7 +75,7 @@ class PythonDes extends Component { ...@@ -75,7 +75,7 @@ class PythonDes extends Component {
{ {
url: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/rumen.png', url: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/rumen.png',
title: '20天零基础入门', title: '20天零基础入门',
subTitle: '降低学习门槛,20天入门人工智能' subTitle: '降低学习门槛,17天入门人工智能'
}, },
], ],
worryList: [ worryList: [
...@@ -96,6 +96,7 @@ class PythonDes extends Component { ...@@ -96,6 +96,7 @@ class PythonDes extends Component {
}, },
], ],
payMoney: 0, payMoney: 0,
isOnline: false, //课程是否上架
} }
} }
...@@ -225,7 +226,18 @@ class PythonDes extends Component { ...@@ -225,7 +226,18 @@ class PythonDes extends Component {
} }
render() { render() {
const {defineList, desList, worryList, syllabus, practice, allSyllabusShow, allPracticeShow, toApp, payMoney} = this.state const {
defineList,
desList,
worryList,
syllabus,
practice,
allSyllabusShow,
allPracticeShow,
toApp,
payMoney,
isOnline
} = this.state
return ( return (
<div className={'python__des'}> <div className={'python__des'}>
<div className={'des__start'}></div> <div className={'des__start'}></div>
...@@ -242,31 +254,56 @@ class PythonDes extends Component { ...@@ -242,31 +254,56 @@ class PythonDes extends Component {
} }
</div> </div>
<div className={'course__introduce'}></div> <div className={'course__introduce'}></div>
<div className={'bottom__btn_group'}> {
<div className={'course__price'}> isOnline
<div className={'money'}>{payMoney}<span style={{fontSize: '18px'}}></span></div> ? (
<div className={'discount'}> <div className={'bottom__btn_group'}>
限时特惠 <div className={'course__price'}>
<div className={'triangle'}></div> <div className={'money'}>{payMoney}<span style={{fontSize: '18px'}}></span></div>
<div className={'discount'}>
限时特惠
<div className={'triangle'}></div>
</div>
</div>
<div className={'btn__group'}>
<div className={'try__study'} onClick={this.tryLearn}>免费试学</div>
<div className={'sign__now'} onClick={this.signUp}>立即报名</div>
</div>
</div>
)
: (
<div className="bottom__btn_group">
<p className="online__label">Python人工智能</p>
<button className="online__button">即将上架 敬请期待</button>
</div> </div>
</div> )
}
{/* 课程介绍 */}
<Description list={desList} />
<div className={'btn__group'}>
<div className={'try__study'} onClick={this.tryLearn}>免费试学</div>
<div className={'sign__now'} onClick={this.signUp}>立即报名</div>
</div>
</div>
<Description list={desList}></Description>
<NoWorry list={worryList}></NoWorry> <NoWorry list={worryList}></NoWorry>
<Study syllabus={syllabus} allSyllabusShow={allSyllabusShow} show={this.showAll} <Study syllabus={syllabus} allSyllabusShow={allSyllabusShow} show={this.showAll}
hide={this.hideSome}></Study> hide={this.hideSome}></Study>
<Test practice={practice} allPracticeShow={allPracticeShow} show={this.showAll} <Test practice={practice} allPracticeShow={allPracticeShow} show={this.showAll}
hide={this.hideSome}></Test> hide={this.hideSome}></Test>
<Team/> <Team/>
<Experience tryLearn={this.tryLearn}/>
<img style={{display: 'block', width: '100%', height: '8px'}} {/* 试学体验 */}
src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/changjian.png" alt=""/> <Experience tryLearn={this.tryLearn} isOnline={isOnline} />
<Progream/> <img
style={{
display: 'block',
width: '100%',
height: '8px'
}}
src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/h5_python_class/changjian.png"
alt=""
/>
{/* 常见问题 */}
<Progream />
{ {
toApp && (<Mask type={1} closePop={this.closePop}/>) toApp && (<Mask type={1} closePop={this.closePop}/>)
} }
......
...@@ -86,6 +86,24 @@ ...@@ -86,6 +86,24 @@
padding: 0 14px; padding: 0 14px;
background: #fff; background: #fff;
.online__label {
font-size: 18px;
font-weight: 600;
color: #525C65;
}
.online__button {
width: 160px;
height: 37px;
border-style: none;
border-radius: 19px;
font-size: 15px;
font-weight: 600;
color: #fff;
background-color: rgba(82,92,101,.6);
outline: none;
}
.course__price { .course__price {
width: 100px; width: 100px;
font-size: 24px; font-size: 24px;
......
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