Commit 34e7ac4d by zhanghaozhe

Merge branch '11-11' into banner

parents 66b2ae72 c7e2d2be
...@@ -150,7 +150,7 @@ class BlessingPreheat extends Component { ...@@ -150,7 +150,7 @@ class BlessingPreheat extends Component {
<div id={'blessing-preheat'}> <div id={'blessing-preheat'}>
<Banner/> <Banner/>
{/* 积福气 */} {/* 积福气 */}
<ListHeader text="积福气,享受更多福利" styles={{margin: '0 0 15px'}} /> <ListHeader id={'lucky-value'} text="积福气,享受更多福利" styles={{margin: '0 0 15px'}} />
<CollectBlessing <CollectBlessing
isSign={isSign} isSign={isSign}
userInfo={userInfo} userInfo={userInfo}
...@@ -161,7 +161,7 @@ class BlessingPreheat extends Component { ...@@ -161,7 +161,7 @@ class BlessingPreheat extends Component {
/> />
{/* 幸运大抽奖--预热 */} {/* 幸运大抽奖--预热 */}
<ListHeader text="幸运大抽奖" styles={{margin: '30px 0 10px'}} /> <ListHeader id={'lucky-draw'} text="幸运大抽奖" styles={{margin: '30px 0 10px'}} />
<p className="luck-draw__tip">- 将于111110点开启 -</p> <p className="luck-draw__tip">- 将于111110点开启 -</p>
<button className="luck-draw__button" onClick={() => this.handleToShow('isRule')}>活动规则></button> <button className="luck-draw__button" onClick={() => this.handleToShow('isRule')}>活动规则></button>
<LuckDraw /> <LuckDraw />
...@@ -170,13 +170,13 @@ class BlessingPreheat extends Component { ...@@ -170,13 +170,13 @@ class BlessingPreheat extends Component {
{ {
isFormal === 0 && isFormal === 0 &&
<> <>
<ListHeader text="预付1元定金,最高可省100元" styles={{margin: '30px 0 15px'}} /> <ListHeader id={'deposit'} text="预付1元定金,最高可省100元" styles={{margin: '30px 0 15px'}} />
<ReserveCourse /> <ReserveCourse />
</> </>
} }
{/* 精品课程特惠专区 */} {/* 精品课程特惠专区 */}
<ListHeader text="精品课程特惠专区" styles={{margin: '30px 0 15px'}} /> <ListHeader id={'best-courses'} text="精品课程特惠专区" styles={{margin: '30px 0 15px'}} />
<CourseList isFormal={isFormal} /> <CourseList isFormal={isFormal} />
{ {
...@@ -235,7 +235,7 @@ class BlessingPreheat extends Component { ...@@ -235,7 +235,7 @@ class BlessingPreheat extends Component {
</Popup> </Popup>
<ListHeader 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')}> <div className="test__record" onClick={() => this.handleToShow('showRecordList')}>
测试记录> 测试记录>
</div> </div>
......
...@@ -4,10 +4,10 @@ import './index.scss'; ...@@ -4,10 +4,10 @@ import './index.scss';
class ListHeader extends Component { class ListHeader extends Component {
render() { render() {
const { text, size, styles } = this.props; const { text, size, styles, id } = this.props;
const cls = size? `list-header--${size}` : ''; const cls = size? `list-header--${size}` : '';
return ( return (
<div className={classnames("list-header", cls)} style={styles}> <div id={id} className={classnames("list-header", cls)} style={styles}>
<i className="list-header__decorate" data-position="left"></i> <i className="list-header__decorate" data-position="left"></i>
{ {
text text
...@@ -20,4 +20,4 @@ class ListHeader extends Component { ...@@ -20,4 +20,4 @@ class ListHeader extends Component {
} }
} }
export default ListHeader; export default ListHeader;
\ No newline at end of file
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